Skip to content

Commit

Permalink
tests: Change mantic tests in behave to noble/oracular
Browse files Browse the repository at this point in the history
Mantic is now EOL, so we are removing the mantic tests from the
acceptance suite.
- If the test was a general one, we add noble/oracular.
- If it was a test which targets interim releases, we add oracular.
- Some oracular tests are commented out until the backend+cloud is
  sorted out.

Signed-off-by: Renan Rodrigo <[email protected]>
  • Loading branch information
renanrodrigo committed Sep 3, 2024
1 parent b3760e5 commit eab89a8
Show file tree
Hide file tree
Showing 32 changed files with 547 additions and 478 deletions.
168 changes: 80 additions & 88 deletions features/_version.feature
Original file line number Diff line number Diff line change
Expand Up @@ -23,73 +23,65 @@ Feature: Pro is expected version
"""

Examples: version
| release | machine_type |
| xenial | lxd-container |
| xenial | lxd-vm |
| xenial | aws.generic |
| xenial | aws.pro |
| xenial | aws.pro-fips |
| xenial | azure.generic |
| xenial | azure.pro |
| xenial | azure.pro-fips |
| xenial | gcp.generic |
| xenial | gcp.pro |
| xenial | gcp.pro-fips |
| bionic | lxd-container |
| bionic | lxd-vm |
| bionic | aws.generic |
| bionic | aws.pro |
| bionic | aws.pro-fips |
| bionic | azure.generic |
| bionic | azure.pro |
| bionic | azure.pro-fips |
| bionic | gcp.generic |
| bionic | gcp.pro |
| bionic | gcp.pro-fips |
| focal | lxd-container |
| focal | lxd-vm |
| focal | aws.generic |
| focal | aws.pro |
| focal | aws.pro-fips |
| focal | azure.generic |
| focal | azure.pro |
| focal | azure.pro-fips |
| focal | gcp.generic |
| focal | gcp.pro |
| focal | gcp.pro-fips |
| jammy | lxd-container |
| jammy | lxd-vm |
| jammy | aws.generic |
| jammy | aws.pro |
| jammy | aws.pro-fips |
| jammy | azure.generic |
| jammy | azure.pro |
| jammy | azure.pro-fips |
| jammy | gcp.generic |
| jammy | gcp.pro |
| jammy | gcp.pro-fips |
| mantic | lxd-container |
| mantic | lxd-vm |
| mantic | aws.generic |
| mantic | aws.pro |
| mantic | aws.pro-fips |
| mantic | azure.generic |
| mantic | azure.pro |
| mantic | azure.pro-fips |
| mantic | gcp.generic |
| mantic | gcp.pro |
| mantic | gcp.pro-fips |
| noble | lxd-container |
| noble | lxd-vm |
| noble | aws.generic |
| noble | aws.pro |
| noble | aws.pro-fips |
| noble | azure.generic |
| noble | azure.pro |
| noble | azure.pro-fips |
| noble | gcp.generic |
| noble | gcp.pro |
| noble | gcp.pro-fips |
| release | machine_type |
| xenial | lxd-container |
| xenial | lxd-vm |
| xenial | aws.generic |
| xenial | aws.pro |
| xenial | aws.pro-fips |
| xenial | azure.generic |
| xenial | azure.pro |
| xenial | azure.pro-fips |
| xenial | gcp.generic |
| xenial | gcp.pro |
| xenial | gcp.pro-fips |
| bionic | lxd-container |
| bionic | lxd-vm |
| bionic | aws.generic |
| bionic | aws.pro |
| bionic | aws.pro-fips |
| bionic | azure.generic |
| bionic | azure.pro |
| bionic | azure.pro-fips |
| bionic | gcp.generic |
| bionic | gcp.pro |
| bionic | gcp.pro-fips |
| focal | lxd-container |
| focal | lxd-vm |
| focal | aws.generic |
| focal | aws.pro |
| focal | aws.pro-fips |
| focal | azure.generic |
| focal | azure.pro |
| focal | azure.pro-fips |
| focal | gcp.generic |
| focal | gcp.pro |
| focal | gcp.pro-fips |
| jammy | lxd-container |
| jammy | lxd-vm |
| jammy | aws.generic |
| jammy | aws.pro |
| jammy | aws.pro-fips |
| jammy | azure.generic |
| jammy | azure.pro |
| jammy | azure.pro-fips |
| jammy | gcp.generic |
| jammy | gcp.pro |
| jammy | gcp.pro-fips |
| noble | lxd-container |
| noble | lxd-vm |
| noble | aws.generic |
| noble | aws.pro |
| noble | aws.pro-fips |
| noble | azure.generic |
| noble | azure.pro |
| noble | azure.pro-fips |
| noble | gcp.generic |
| noble | gcp.pro |
| noble | gcp.pro-fips |
# no oracular on clouds yet - add it when those are available
| oracular | lxd-container |
| oracular | lxd-vm |

@uses.config.check_version @upgrade
Scenario Outline: Check pro version
Expand All @@ -114,13 +106,13 @@ Feature: Pro is expected version
"""

Examples: version
| release | machine_type |
| xenial | lxd-container |
| bionic | lxd-container |
| focal | lxd-container |
| jammy | lxd-container |
| mantic | lxd-container |
| noble | lxd-container |
| release | machine_type |
| xenial | lxd-container |
| bionic | lxd-container |
| focal | lxd-container |
| jammy | lxd-container |
| noble | lxd-container |
| oracular | lxd-container |

@uses.config.contract_token
Scenario Outline: Attached show version in a ubuntu machine
Expand All @@ -136,13 +128,13 @@ Feature: Pro is expected version
Then I will see the uaclient version on stdout

Examples: ubuntu release
| release | machine_type |
| bionic | lxd-container |
| focal | lxd-container |
| xenial | lxd-container |
| jammy | lxd-container |
| mantic | lxd-container |
| noble | lxd-container |
| release | machine_type |
| bionic | lxd-container |
| focal | lxd-container |
| xenial | lxd-container |
| jammy | lxd-container |
| noble | lxd-container |
| oracular | lxd-container |

Scenario Outline: Check for newer versions of the client in an ubuntu machine
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
Expand Down Expand Up @@ -218,10 +210,10 @@ Feature: Pro is expected version
"""

Examples: ubuntu release
| release | machine_type |
| xenial | lxd-container |
| bionic | lxd-container |
| focal | lxd-container |
| jammy | lxd-container |
| mantic | lxd-container |
| noble | lxd-container |
| release | machine_type |
| xenial | lxd-container |
| bionic | lxd-container |
| focal | lxd-container |
| jammy | lxd-container |
| noble | lxd-container |
| oracular | lxd-container |
56 changes: 28 additions & 28 deletions features/api/api.feature
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ Feature: Client behaviour for the API endpoints
When I run `python3 -c "from uaclient.api.u.pro.detach.v1 import detach"` as non-root

Examples: ubuntu release
| release | machine_type |
| xenial | lxd-container |
| bionic | lxd-container |
| focal | lxd-container |
| jammy | lxd-container |
| mantic | lxd-container |
| noble | lxd-container |
| release | machine_type |
| xenial | lxd-container |
| bionic | lxd-container |
| focal | lxd-container |
| jammy | lxd-container |
| noble | lxd-container |
| oracular | lxd-container |

Scenario Outline: API invalid endpoint or args
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
Expand Down Expand Up @@ -75,13 +75,13 @@ Feature: Client behaviour for the API endpoints
"""

Examples: ubuntu release
| release | machine_type |
| xenial | lxd-container |
| bionic | lxd-container |
| focal | lxd-container |
| jammy | lxd-container |
| mantic | lxd-container |
| noble | lxd-container |
| release | machine_type |
| xenial | lxd-container |
| bionic | lxd-container |
| focal | lxd-container |
| jammy | lxd-container |
| noble | lxd-container |
| oracular | lxd-container |

Scenario Outline: Basic endpoints
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
Expand Down Expand Up @@ -167,13 +167,13 @@ Feature: Client behaviour for the API endpoints
"""

Examples: ubuntu release
| release | machine_type |
| xenial | lxd-container |
| bionic | lxd-container |
| focal | lxd-container |
| jammy | lxd-container |
| mantic | lxd-container |
| noble | lxd-container |
| release | machine_type |
| xenial | lxd-container |
| bionic | lxd-container |
| focal | lxd-container |
| jammy | lxd-container |
| noble | lxd-container |
| oracular | lxd-container |

@uses.config.contract_token
Scenario Outline: u.pro.status.is_attached.v1
Expand Down Expand Up @@ -279,10 +279,10 @@ Feature: Client behaviour for the API endpoints
"""

Examples: ubuntu release
| release | machine_type |
| xenial | lxd-container |
| bionic | lxd-container |
| focal | lxd-container |
| jammy | lxd-container |
| mantic | lxd-container |
| noble | lxd-container |
| release | machine_type |
| xenial | lxd-container |
| bionic | lxd-container |
| focal | lxd-container |
| jammy | lxd-container |
| noble | lxd-container |
| oracular | lxd-container |
5 changes: 3 additions & 2 deletions features/api/enable.feature
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,9 @@ Feature: u.pro.services.enable
"""

Examples:
| release | machine_type |
| mantic | lxd-container |
| release | machine_type |
| noble | lxd-container |
| oracular | lxd-container |

Scenario Outline: u.pro.services.enable.v1 vm services
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
Expand Down
4 changes: 2 additions & 2 deletions features/api/fix_plan.feature
Original file line number Diff line number Diff line change
Expand Up @@ -3011,5 +3011,5 @@ Feature: Fix plan API endpoints
"""

Examples: ubuntu release details
| release | machine_type |
| mantic | lxd-vm |
| release | machine_type |
| oracular | lxd-vm |
3 changes: 2 additions & 1 deletion features/api/packages.feature
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,5 @@ Feature: Package related API endpoints
| focal | wsl | libcurl4 | 7.68.0-1ubuntu2 | standard-security |
| jammy | lxd-container | libcurl4 | 7.81.0-1 | standard-security |
| jammy | wsl | libcurl4 | 7.81.0-1 | standard-security |
| mantic | lxd-container | libcurl4 | 8.2.1-1ubuntu3 | standard-security |

# TODO: add noble/oracular?
13 changes: 7 additions & 6 deletions features/api/services_dependencies.feature
Original file line number Diff line number Diff line change
Expand Up @@ -365,9 +365,10 @@ Feature: u.pro.services.dependencies
"""

Examples: ubuntu release
| release | machine_type |
| xenial | lxd-container |
| bionic | lxd-container |
| focal | lxd-container |
| jammy | lxd-container |
| mantic | lxd-container |
| release | machine_type |
| xenial | lxd-container |
| bionic | lxd-container |
| focal | lxd-container |
| jammy | lxd-container |
| noble | lxd-container |
| oracular | lxd-container |
14 changes: 7 additions & 7 deletions features/api/unattended_upgrades.feature
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,10 @@ Feature: api.u.unattended_upgrades.status.v1
"""

Examples: ubuntu release
| release | machine_type | extra_field |
| xenial | lxd-container | |
| bionic | lxd-container | ,\n"Unattended-Upgrade::DevRelease": "false" |
| focal | lxd-container | ,\n"Unattended-Upgrade::DevRelease": "auto" |
| jammy | lxd-container | ,\n"Unattended-Upgrade::DevRelease": "auto" |
| mantic | lxd-container | ,\n"Unattended-Upgrade::DevRelease": "auto" |
| noble | lxd-container | ,\n"Unattended-Upgrade::DevRelease": "auto" |
| release | machine_type | extra_field |
| xenial | lxd-container | |
| bionic | lxd-container | ,\n"Unattended-Upgrade::DevRelease": "false" |
| focal | lxd-container | ,\n"Unattended-Upgrade::DevRelease": "auto" |
| jammy | lxd-container | ,\n"Unattended-Upgrade::DevRelease": "auto" |
| noble | lxd-container | ,\n"Unattended-Upgrade::DevRelease": "auto" |
| oracular | lxd-container | ,\n"Unattended-Upgrade::DevRelease": "auto" |
Loading

0 comments on commit eab89a8

Please sign in to comment.