Skip to content

Commit

Permalink
Add arm64 tag to tests
Browse files Browse the repository at this point in the history
@arm64 tag added to basic tests for running weekly on new arm64 jenkins job
  • Loading branch information
dheyay committed Aug 27, 2024
1 parent cd40f70 commit 7355f15
Show file tree
Hide file tree
Showing 20 changed files with 38 additions and 12 deletions.
5 changes: 4 additions & 1 deletion features/api.feature
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Feature: Client behaviour for the API endpoints

@arm64
Scenario Outline: all API endpoints can be imported individually
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I run `python3 -c "from uaclient.api.u.pro.attach.auto.configure_retry_service.v1 import configure_retry_service"` as non-root
Expand Down Expand Up @@ -34,6 +35,7 @@ Feature: Client behaviour for the API endpoints
| mantic | lxd-container |
| noble | lxd-container |

@arm64
Scenario Outline: API invalid endpoint or args
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I verify that running `pro api invalid.endpoint` `with sudo` exits `1`
Expand Down Expand Up @@ -83,6 +85,7 @@ Feature: Client behaviour for the API endpoints
| mantic | lxd-container |
| noble | lxd-container |

@arm64
Scenario Outline: Basic endpoints
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I run `pro api u.pro.version.v1` with sudo
Expand Down Expand Up @@ -175,7 +178,7 @@ Feature: Client behaviour for the API endpoints
| mantic | lxd-container |
| noble | lxd-container |

@uses.config.contract_token
@uses.config.contract_token @arm64
Scenario Outline: u.pro.status.is_attached.v1
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I run `pro api u.pro.status.is_attached.v1` with sudo
Expand Down
2 changes: 1 addition & 1 deletion features/api_detach.feature
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Feature: Detach API endpoint

@uses.config.contract_token
@uses.config.contract_token @arm64
Scenario Outline: Detach API endpoint on an attached machine
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I verify that running `pro api u.pro.detach.v1` `as non-root` exits `1`
Expand Down
1 change: 1 addition & 0 deletions features/api_disable.feature
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Feature: u.pro.services.disable

@arm64
Scenario Outline: u.pro.services.disable.v1 container services
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I apt update
Expand Down
1 change: 1 addition & 0 deletions features/api_enable.feature
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Feature: u.pro.services.enable

@arm64
Scenario Outline: u.pro.services.enable.v1 container services
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I apt update
Expand Down
2 changes: 1 addition & 1 deletion features/apt_messages.feature
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Feature: APT Messages

@uses.config.contract_token
@uses.config.contract_token @arm64
Scenario Outline: APT JSON Hook prints package counts correctly on xenial
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I attach `contract_token` with sudo
Expand Down
1 change: 1 addition & 0 deletions features/attach_invalidtoken.feature
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Feature: Command behaviour when trying to attach a machine to an Ubuntu
Pro subscription using an invalid token

@arm64
Scenario Outline: Attach command failure on invalid token
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I verify that running `pro attach INVALID_TOKEN` `with sudo` exits `1`
Expand Down
1 change: 1 addition & 0 deletions features/attach_validtoken.feature
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ Feature: Command behaviour when attaching a machine to an Ubuntu Pro
| jammy | lxd-container | hello=2.10-2ubuntu4 | n/a | usg | n/a | n/a | Canonical Livepatch service |
| noble | lxd-container | hello=2.10-3build1 | n/a | usg | n/a | n/a | Canonical Livepatch service |

@arm64
Scenario Outline: Attach command with attach config
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
# simplest happy path
Expand Down
4 changes: 4 additions & 0 deletions features/attached_enable.feature
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@uses.config.contract_token
Feature: Enable command behaviour when attached to an Ubuntu Pro subscription

@arm64
Scenario Outline: Attached enable Common Criteria service in an ubuntu lxd container
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I attach `contract_token` with sudo
Expand Down Expand Up @@ -28,6 +29,7 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
| bionic | lxd-container |
| bionic | wsl |

@arm64
Scenario Outline: Enable cc-eal with --access-only
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I attach `contract_token` with sudo
Expand Down Expand Up @@ -69,6 +71,7 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
| jammy | lxd-container | 22.04 LTS | Jammy Jellyfish |
| mantic | lxd-container | 23.10 | Mantic Minotaur |

@arm64
Scenario Outline: Empty series affordance means no series, null means all series
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I attach `contract_token` with sudo and options `--no-auto-enable`
Expand Down Expand Up @@ -190,6 +193,7 @@ Feature: Enable command behaviour when attached to an Ubuntu Pro subscription
| jammy | lxd-container | anbox-cloud, cc-eal, esm-apps, esm-infra, fips, fips-preview, fips-updates,\nlandscape, livepatch, realtime-kernel, ros, ros-updates, usg. |
| noble | lxd-container | anbox-cloud, cc-eal, esm-apps, esm-infra, fips, fips-preview, fips-updates,\nlandscape, livepatch, realtime-kernel, ros, ros-updates, usg. |

@arm64
Scenario Outline: Attached enable of a service in a ubuntu machine
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I attach `contract_token` with sudo
Expand Down
8 changes: 4 additions & 4 deletions features/attached_status.feature
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Feature: Attached status

@uses.config.contract_token
@uses.config.contract_token @arm64
Scenario Outline: Attached status in a ubuntu machine - formatted
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I attach `contract_token` with sudo
Expand Down Expand Up @@ -38,7 +38,7 @@ Feature: Attached status
| mantic | lxd-container |
| noble | lxd-container |

@uses.config.contract_token
@uses.config.contract_token @arm64
Scenario Outline: Non-root status can see in-progress operations
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I attach `contract_token` with sudo
Expand Down Expand Up @@ -287,7 +287,7 @@ Feature: Attached status
| jammy | azure.pro |
| jammy | gcp.pro |

@uses.config.contract_token
@uses.config.contract_token @arm64
Scenario Outline: Attached status in a ubuntu machine
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I attach `contract_token` with sudo
Expand Down Expand Up @@ -431,7 +431,7 @@ Feature: Attached status
| release | machine_type |
| jammy | lxd-container |

@uses.config.contract_token
@uses.config.contract_token @arm64
Scenario Outline: Attached status in the latest LTS ubuntu machine
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I attach `contract_token` with sudo
Expand Down
3 changes: 2 additions & 1 deletion features/collect_logs.feature
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Feature: Command behaviour when attached to an Ubuntu Pro subscription

@arm64
Scenario Outline: Run collect-logs on an unattached machine
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I run `python3 /usr/lib/ubuntu-advantage/timer.py` with sudo
Expand Down Expand Up @@ -47,7 +48,7 @@ Feature: Command behaviour when attached to an Ubuntu Pro subscription
| mantic | lxd-container |
| noble | lxd-container |

@uses.config.contract_token
@uses.config.contract_token @arm64
Scenario Outline: Run collect-logs on an attached machine
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I attach `contract_token` with sudo
Expand Down
1 change: 1 addition & 0 deletions features/config.feature
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Feature: pro config sub-command

# earliest, latest lts[, latest stable]
@arm64
Scenario Outline: old ua_config in uaclient.conf is still supported
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I run `pro config show` with sudo
Expand Down
4 changes: 2 additions & 2 deletions features/daemon.feature
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Feature: Pro Upgrade Daemon only runs in environments where necessary

@uses.config.contract_token
@uses.config.contract_token @arm64
Scenario Outline: cloud-id-shim service is not installed on anything other than xenial
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
Then I verify that running `systemctl status ubuntu-advantage-cloud-id-shim.service` `with sudo` exits `4`
Expand All @@ -17,7 +17,7 @@ Feature: Pro Upgrade Daemon only runs in environments where necessary
| mantic | lxd-container |
| noble | lxd-container |

@uses.config.contract_token
@uses.config.contract_token @arm64
Scenario Outline: cloud-id-shim should run in postinst and on boot
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
# verify installing pro created the cloud-id file
Expand Down
1 change: 1 addition & 0 deletions features/help.feature
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Feature: Pro Client help text

@arm64
Scenario Outline: Help text for the Pro Client commands
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I run `pro --help` as non-root
Expand Down
1 change: 1 addition & 0 deletions features/magic_attach.feature
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Feature: Magic attach flow related tests

@arm64
Scenario Outline: Attach using the magic attach flow
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I create the file `/tmp/response-overlay.json` with the following:
Expand Down
2 changes: 1 addition & 1 deletion features/reboot_cmds.feature
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@uses.config.contract_token
@uses.config.contract_token @arm64
Feature: Reboot Commands

Scenario Outline: reboot-cmds removes fips package holds and updates packages
Expand Down
3 changes: 2 additions & 1 deletion features/security_status.feature
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Feature: Security status command behavior

@uses.config.contract_token
@uses.config.contract_token @arm64
Scenario Outline: Run security status with JSON/YAML format
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I apt update
Expand Down Expand Up @@ -772,6 +772,7 @@ Feature: Security status command behavior
| focal | wsl |

# Latest released non-LTS
@arm64
Scenario: Run security status in an Ubuntu machine
Given a `mantic` `lxd-container` machine with ubuntu-advantage-tools installed
When I install third-party / unknown packages in the machine
Expand Down
2 changes: 2 additions & 0 deletions features/subscription_attach_restrictions.feature
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@uses.config.contract_token
Feature: One time pro subscription related tests

@arm64
Scenario Outline: Attach fail if subscription is restricted to release
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I create the file `/tmp/response-overlay.json` with the following:
Expand Down Expand Up @@ -46,6 +47,7 @@ Feature: One time pro subscription related tests
| jammy | lxd-container | focal | 20.04 LTS | Focal Fossa |
| noble | lxd-container | jammy | 22.04 LTS | Jammy Jellyfish |

@arm64
Scenario Outline: Check notice visible when attached with onlySeries present
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I create the file `/tmp/response-overlay.json` with the following:
Expand Down
1 change: 1 addition & 0 deletions features/timer.feature
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Feature: Timer for regular background jobs while attached

# earlies, latest lts, devel
@arm64
Scenario Outline: Timer is stopped when detached, started when attached
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
Then I verify the `ua-timer` systemd timer is disabled
Expand Down
4 changes: 4 additions & 0 deletions features/unattached_commands.feature
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Feature: Command behaviour when unattached

@arm64
Scenario Outline: Unattached auto-attach does nothing in a ubuntu machine
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
# Validate systemd unit/timer syntax
Expand Down Expand Up @@ -64,6 +65,7 @@ Feature: Command behaviour when unattached
| noble | lxd-container | detach |
| noble | lxd-container | refresh |

@arm64
Scenario Outline: Help command on an unattached machine
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I run `pro help esm-infra` as non-root
Expand Down Expand Up @@ -112,6 +114,7 @@ Feature: Command behaviour when unattached
| mantic | lxd-container | no |
| noble | lxd-container | yes |

@arm64
Scenario Outline: Unattached enable/disable fails in a ubuntu machine
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I verify that running `pro <command> esm-infra` `as non-root` exits `1`
Expand Down Expand Up @@ -192,6 +195,7 @@ Feature: Command behaviour when unattached
| noble | lxd-container | enable |
| noble | lxd-container | disable |

@arm64
Scenario Outline: Check for newer versions of the client in an ubuntu machine
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
# Make sure we have a fresh, just rebooted, environment
Expand Down
3 changes: 3 additions & 0 deletions features/unattached_status.feature
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Feature: Unattached status

@arm64
Scenario Outline: Unattached status in a ubuntu machine - formatted
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I run `pro status --format json` as non-root
Expand Down Expand Up @@ -41,6 +42,7 @@ Feature: Unattached status
| mantic | lxd-container |
| noble | lxd-container |

@arm64
Scenario Outline: Unattached status in a ubuntu machine
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I verify root and non-root `pro status` calls have the same output
Expand Down Expand Up @@ -271,6 +273,7 @@ Feature: Unattached status
| release | machine_type |
| jammy | lxd-container |

@arm64
Scenario Outline: Unattached status in a ubuntu machine
Given a `<release>` `<machine_type>` machine with ubuntu-advantage-tools installed
When I verify root and non-root `pro status` calls have the same output
Expand Down

0 comments on commit 7355f15

Please sign in to comment.