From b93f67f14eb37be766bab2cede866156dfa14de0 Mon Sep 17 00:00:00 2001
From: Renan Rodrigo <renanrodrigo@canonical.com>
Date: Wed, 15 Nov 2023 09:19:04 -0300
Subject: [PATCH] tests: add mantic->noble upgrade test

Signed-off-by: Renan Rodrigo <renanrodrigo@canonical.com>
---
 features/ubuntu_upgrade.feature            | 1 +
 features/ubuntu_upgrade_unattached.feature | 5 +++--
 tox.ini                                    | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/features/ubuntu_upgrade.feature b/features/ubuntu_upgrade.feature
index 2672a20fa5..1f648698f0 100644
--- a/features/ubuntu_upgrade.feature
+++ b/features/ubuntu_upgrade.feature
@@ -55,6 +55,7 @@ Feature: Upgrade between releases when uaclient is attached
         | focal   | jammy        | lts    |                 | esm-infra | enabled         | esm-apps | enabled         | true           |
         | jammy   | lunar        | normal |                 | esm-infra | n/a             | esm-apps | n/a             | true           |
         | lunar   | mantic       | normal |                 | esm-infra | n/a             | esm-apps | n/a             | true           |
+        | mantic  | noble        | normal | --devel-release | esm-infra | n/a             | esm-apps | n/a             | true           |
 
     @slow
     @series.xenial
diff --git a/features/ubuntu_upgrade_unattached.feature b/features/ubuntu_upgrade_unattached.feature
index e745a8d4f3..69a8930268 100644
--- a/features/ubuntu_upgrade_unattached.feature
+++ b/features/ubuntu_upgrade_unattached.feature
@@ -43,11 +43,11 @@ Feature: Upgrade between releases when uaclient is unattached
         And I verify that the folder `/var/lib/ubuntu-advantage/apt-esm` does not exist
         When I run `apt update` with sudo
         And I run shell command `cat /var/lib/ubuntu-advantage/apt-esm/etc/apt/sources.list.d/ubuntu-esm-apps.list || true` with sudo
-        Then if `<next_release>` not in `lunar or mantic` and stdout matches regexp:
+        Then if `<next_release>` not in `lunar or mantic or noble` and stdout matches regexp:
         """
         deb https://esm.ubuntu.com/apps/ubuntu <next_release>-apps-security main
         """
-        And if `<next_release>` not in `lunar or mantic` and stdout matches regexp:
+        And if `<next_release>` not in `lunar or mantic or noble` and stdout matches regexp:
         """
         deb https://esm.ubuntu.com/apps/ubuntu <next_release>-apps-updates main
         """
@@ -65,3 +65,4 @@ Feature: Upgrade between releases when uaclient is unattached
         | focal   | jammy        | lts    |                 | enabled        |
         | jammy   | lunar        | normal |                 | n/a            |
         | lunar   | mantic       | normal |                 | n/a            |
+        | mantic  | noble        | normal | --devel-release | n/a            |
diff --git a/tox.ini b/tox.ini
index 5f1a681277..7f1f811517 100644
--- a/tox.ini
+++ b/tox.ini
@@ -56,6 +56,7 @@ commands =
     behave-upgrade-20.04: behave -v {posargs} --tags="upgrade" --tags="series.focal,series.all"
     behave-upgrade-22.04: behave -v {posargs} --tags="upgrade" --tags="series.jammy,series.all"
     behave-upgrade-23.04: behave -v {posargs} --tags="upgrade" --tags="series.lunar,series.all"
+    behave-upgrade-23.10: behave -v {posargs} --tags="upgrade" --tags="series.mantic,series.all"
 
     behave-awsgeneric-16.04: behave -v {posargs} --tags="uses.config.machine_type.aws.generic" --tags="series.xenial,series.lts,series.all" --tags="~upgrade"
     behave-awsgeneric-18.04: behave -v {posargs} --tags="uses.config.machine_type.aws.generic" --tags="series.bionic,series.lts,series.all" --tags="~upgrade"