From 3df82f2f8b36aa912593570c9cbf1d4cc5d237a8 Mon Sep 17 00:00:00 2001 From: Sergio Cazzolato Date: Wed, 29 Jul 2026 11:25:05 -0300 Subject: [PATCH] tests: remove google support in spread tests As google is not used anymore to run spread tests in the ci, we are removing the support to make spread compute faster the tasks and in order to reduce the complexity of the test suites. --- .github/workflows/nightly-spread.yaml | 28 +-- .github/workflows/spread-tests.yaml | 2 - spread.yaml | 236 +----------------- tests/cross/go-build/task.yaml | 4 - tests/lib/nested.sh | 10 +- tests/lib/prepare.sh | 4 +- tests/main/boot-state/task.yaml | 2 +- tests/main/cloud-init/task.yaml | 61 ++--- tests/main/interfaces-avahi-observe/task.yaml | 2 +- tests/main/listing/task.yaml | 4 +- tests/main/mount-ns/task.yaml | 4 +- tests/main/nss-modules/task.yaml | 3 - tests/main/snaps-state/task.yaml | 2 +- tests/nightly/upload-snapd-to-gce/task.yaml | 80 ------ tests/schemas/spread-schema.json | 114 --------- 15 files changed, 41 insertions(+), 515 deletions(-) delete mode 100644 tests/nightly/upload-snapd-to-gce/task.yaml diff --git a/.github/workflows/nightly-spread.yaml b/.github/workflows/nightly-spread.yaml index 63bcc0ec8cc..e2f265811ad 100644 --- a/.github/workflows/nightly-spread.yaml +++ b/.github/workflows/nightly-spread.yaml @@ -3,7 +3,7 @@ name: Nightly spread executions # See https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#onschedule on: schedule: - # usual nightly run, google tests, and experimental features + # usual nightly run and experimental features - cron: '0 2 * * *' # spread run from json fundamental, non-fundamental, and nested - cron: '0 3 * * *' @@ -16,7 +16,7 @@ on: description: Job to run options: - spread-nightly - - spread-nightly-google + - spread-nightly-openstack - spread-test-build-from-current - spread-test-experimental - spread-test-openstack @@ -52,12 +52,12 @@ jobs: rules: '' use-snapd-snap-from-master: true - spread-nightly-google: - if: ${{ github.event.schedule == '0 2 * * *' || (github.event_name == 'workflow_dispatch' && inputs.job == 'spread-nightly-google') }} + spread-nightly-garden: + if: ${{ github.event.schedule == '0 2 * * *' || (github.event_name == 'workflow_dispatch' && inputs.job == 'spread-nightly-openstack') }} uses: ./.github/workflows/spread-tests.yaml secrets: inherit with: - runs-on: '["self-hosted", "spread-enabled"]' + runs-on: ubuntu-latest group: ${{ matrix.group }} backend: ${{ matrix.backend }} systems: ${{ matrix.systems }} @@ -70,25 +70,13 @@ jobs: matrix: include: - group: jammy - backend: google + backend: garden systems: 'ubuntu-22.04-64' tasks: 'tests/main/apparmor-prompting-integration-tests tests/main/interfaces-requests-activates-handlers' - - group: google - backend: google - systems: 'ALL' - tasks: 'tests/main/microk8s-smoke tests/main/download-timeout tests/main/snap-network-errors tests/main/snapd-snap:lxd tests/main/apparmor-prompting-support tests/main/proxy' - - group: google-core - backend: google-core + - group: garden + backend: garden systems: 'ALL' tasks: 'tests/main/microk8s-smoke tests/main/download-timeout tests/main/snap-network-errors tests/main/snapd-snap:lxd tests/main/apparmor-prompting-support tests/main/proxy' - - group: google-distro - backend: google-distro - systems: 'ALL' - tasks: 'tests/main/microk8s-smoke tests/main/download-timeout tests/main/snap-network-errors tests/main/snapd-snap:lxd tests/main/apparmor-prompting-support tests/main/proxy' - - group: google-arm - backend: google-distro - systems: 'ubuntu-22.04-arm-64 ubuntu-core-24-arm-64' - tasks: 'tests/main/microk8s-smoke tests/main/download-timeout tests/main/snap-network-errors tests/main/snapd-snap:lxd tests/main/apparmor-prompting-support tests/main/proxy' spread-test-build-from-current: if: ${{ github.event.schedule == '0 6 * * *' || (github.event_name == 'workflow_dispatch' && inputs.job == 'spread-test-build-from-current') }} diff --git a/.github/workflows/spread-tests.yaml b/.github/workflows/spread-tests.yaml index 38b3d7d404d..4bb59abfc1c 100644 --- a/.github/workflows/spread-tests.yaml +++ b/.github/workflows/spread-tests.yaml @@ -459,8 +459,6 @@ jobs: - name: Run spread tests if: ${{ env.SKIP_SPREAD_LABEL != 'true' && env.RUN_TESTS == 'true' }} - env: - SPREAD_GOOGLE_KEY: ${{ secrets.SPREAD_GOOGLE_KEY }} run: | # Register a problem matcher to highlight spread failures echo "::add-matcher::.github/spread-problem-matcher.json" diff --git a/spread.yaml b/spread.yaml index 92c73d60601..84f86740157 100644 --- a/spread.yaml +++ b/spread.yaml @@ -145,221 +145,6 @@ environment: SNAPD_SKIP_EARLY_REFRESH: '$(HOST: echo "${SPREAD_SNAPD_SKIP_EARLY_REFRESH:-}")' backends: - google: - key: '$(HOST: echo "$SPREAD_GOOGLE_KEY")' - location: snapd-spread/europe-west2-b - halt-timeout: 2h - systems: - - ubuntu-14.04-64: - workers: 6 - - ubuntu-16.04-64: - workers: 8 - storage: 15G - - ubuntu-18.04-64: - storage: 15G - workers: 8 - - ubuntu-20.04-64: - image: ubuntu-2004-64 - storage: 16G - workers: 8 - - ubuntu-secboot-20.04-64: - image: ubuntu-2004-64 - storage: 16G - workers: 1 - secure-boot: true - - ubuntu-22.04-64: - image: ubuntu-2204-64 - storage: 15G - workers: 8 - - ubuntu-24.04-64: - image: ubuntu-2404-64 - storage: 15G - workers: 8 - - google-core: - type: google - key: '$(HOST: echo "$SPREAD_GOOGLE_KEY")' - location: snapd-spread/europe-west1-b - halt-timeout: 2h - systems: - - ubuntu-core-16-64: - image: ubuntu-16.04-64 - workers: 6 - storage: 20G - - ubuntu-core-18-64: - image: ubuntu-18.04-64 - workers: 6 - storage: 20G - - ubuntu-core-20-64: - image: ubuntu-2004-64 - workers: 8 - storage: 20G - - ubuntu-core-22-64: - image: ubuntu-2204-64 - workers: 8 - storage: 20G - - ubuntu-core-24-64: - image: ubuntu-2404-64 - workers: 8 - storage: 20G - - ubuntu-core-26-64: - image: ubuntu-2604-64 - workers: 8 - storage: 20G - - google-pro: - type: google - # XXX the role assigned to the key must allow for attaching service - # accounts - key: '$(HOST: echo "$SPREAD_GOOGLE_KEY")' - location: snapd-spread/europe-west1-b - halt-timeout: 2h - systems: - - ubuntu-pro-20.04-64: - image: ubuntu-os-pro-cloud/ubuntu-pro-2004-lts - workers: 1 - attach-service-account: true - - - ubuntu-pro-22.04-64: - image: ubuntu-os-pro-cloud/ubuntu-pro-2204-lts - workers: 1 - attach-service-account: true - - - ubuntu-fips-20.04-64: - image: ubuntu-os-pro-cloud/ubuntu-pro-2004-lts - workers: 1 - attach-service-account: true - - - ubuntu-fips-22.04-64: - image: ubuntu-os-pro-cloud/ubuntu-pro-2204-lts - workers: 1 - attach-service-account: true - - - ubuntu-fips-24.04-64: - image: ubuntu-os-pro-cloud/ubuntu-pro-2404-lts-amd64 - workers: 1 - attach-service-account: true - - google-distro: - type: google - key: '$(HOST: echo "$SPREAD_GOOGLE_KEY")' - location: snapd-spread/europe-west3-b - halt-timeout: 2h - systems: - - debian-12-64: - storage: 20G - workers: 6 - - debian-sid-64: - storage: 20G - workers: 6 - - - amazon-linux-2023-64: - workers: 6 - storage: preserve-size - - - arch-linux-64: - workers: 6 - storage: 20G - - - centos-9-64: - workers: 6 - storage: preserve-size - image: centos-9-64 - - - opensuse-16.0-64: - workers: 6 - - opensuse-tumbleweed-64: - workers: 6 - storage: 12G - - opensuse-tumbleweed-selinux-64: - image: snapd-spread/opensuse-tumbleweed-64-selinux-enabled - workers: 6 - storage: 12G - - google-arm: - type: google - key: '$(HOST: echo "$SPREAD_GOOGLE_KEY")' - location: snapd-spread/us-central1-a - plan: t2a-standard-1 - halt-timeout: 2h - kill-timeout: 60m - systems: - - ubuntu-20.04-arm-64: - image: ubuntu-os-cloud/ubuntu-2004-lts-arm64 - workers: 8 - storage: 15G - - ubuntu-22.04-arm-64: - image: ubuntu-os-cloud/ubuntu-2204-lts-arm64 - workers: 8 - storage: 15G - - ubuntu-24.04-arm-64: - image: ubuntu-os-cloud/ubuntu-2404-lts-arm64 - workers: 8 - storage: 15G - - ubuntu-core-22-arm-64: - image: ubuntu-22.04-arm-64 - workers: 6 - storage: 30G - - ubuntu-core-24-arm-64: - image: ubuntu-24.04-arm-64 - workers: 6 - storage: 30G - # TODO add garden-sru backend - google-nested: - type: google - key: '$(HOST: echo "$SPREAD_GOOGLE_KEY")' - location: snapd-spread/us-central1-a - plan: n2-standard-2 - halt-timeout: 2h - environment: - NESTED_ARCHITECTURE: amd64 - systems: &google-nested-systems - - ubuntu-16.04-64: - image: ubuntu-1604-64-virt-enabled - storage: 20G - workers: 4 - - ubuntu-18.04-64: - image: ubuntu-1804-64-virt-enabled - storage: 20G - workers: 4 - - ubuntu-20.04-64: - image: ubuntu-2004-64-virt-enabled - storage: 20G - workers: 12 - - ubuntu-22.04-64: - image: ubuntu-2204-64-virt-enabled - storage: 25G - workers: 14 - - ubuntu-24.04-64: - image: ubuntu-2404-64-virt-enabled - storage: 30G - workers: 14 - - ubuntu-26.04-64: - image: ubuntu-2604-64-virt-enabled - storage: 30G - workers: 14 - - google-nested-arm: - type: google - key: '$(HOST: echo "$SPREAD_GOOGLE_KEY")' - location: snapd-spread/us-central1-a - plan: c4a-highcpu-4 - halt-timeout: 2h - environment: - NESTED_ARCHITECTURE: arm64 - NESTED_ENABLE_KVM: false - NESTED_ENABLE_TPM: '$(HOST: echo "${NESTED_ENABLE_TPM:-false}")' - NESTED_ENABLE_SECURE_BOOT: '$(HOST: echo "${NESTED_ENABLE_SECURE_BOOT:-false}")' - systems: - - ubuntu-22.04-arm-64: - image: ubuntu-2204-arm-64-virt-enabled - storage: 25G - workers: 8 - - ubuntu-24.04-arm-64: - image: ubuntu-2404-arm-64-virt-enabled - storage: 25G - workers: 8 - openstack: key: '$(HOST: echo "$OS_CREDENTIALS_AMD64_PS7")' plan: shared.xsmall @@ -1184,7 +969,7 @@ repack: | # obtained directly from GitHub. There's nothing special about that reference, # other than it will often be in the local repository's history already. # The more recent the reference, the smaller the delta. - if ! echo "$SPREAD_BACKENDS" | grep -e linode -e google; then + if ! echo "$SPREAD_BACKENDS" | grep -e openstack; then cat <&3 >&4 elif ! git show-ref "$DELTA_REF" > /dev/null; then cat <&3 >&4 @@ -1242,9 +1027,6 @@ prepare: | fi if [[ "$SPREAD_SYSTEM" == opensuse-* ]]; then - # refresh metadatadata - # Auto import gpg keys needed for could repository added to support google backend - zypper --gpg-auto-import-keys ref # We seem to be hitting a flaky openSUSE mirror from time to time, # increase the number of download attempts libzypp will try to # workaround that. @@ -1311,12 +1093,6 @@ prepare: | ;; esac - # Make sure ssh service is restarted after it is killed by spread (pkill -o -HUP sshd) - # during the machine setup in google systems. For more details see lp:2011458 - if [[ "$SPREAD_BACKEND" =~ google ]] && [[ "$SPREAD_SYSTEM" == ubuntu-2* ]] && ! systemctl is-active ssh; then - systemctl restart ssh - fi - # LSM correctness check case "$SPREAD_SYSTEM" in ubuntu-*|debian-*|arch-*) @@ -1458,7 +1234,7 @@ restore-each: | suites: tests/lib/tools/suite/: summary: Tests for tests/lib/tools tools - backends: [google, qemu, garden] + backends: [openstack, qemu, garden] prepare-each: | tests.invariant set snap-mount-dir "$(os.paths snap-mount-dir)" "$TESTSLIB"/prepare-restore.sh --prepare-suite-each-minimal-no-snaps @@ -1697,9 +1473,7 @@ suites: tests/nested/manual/: summary: Tests for nested images controlled manually from the tests backends: - - google-nested - qemu-nested - - google-nested-arm - garden - openstack-ext - openstack-arm-ext @@ -1788,9 +1562,7 @@ suites: tests/nested/classic/: summary: Tests for nested images backends: - - google-nested - qemu-nested - - google-nested-arm - openstack-ext - openstack-arm-ext - openstack-ext-dev @@ -1860,9 +1632,7 @@ suites: tests/nested/core/: summary: Tests for nested images backends: - - google-nested - qemu-nested - - google-nested-arm - openstack-ext - openstack-arm-ext - openstack-ext-dev @@ -1942,9 +1712,7 @@ suites: tests/perf/nested/: summary: Performance and Load tests preparation suite backends: - - google-nested - qemu-nested - - google-nested-arm - openstack-ext - openstack-arm-ext - openstack-ext-dev diff --git a/tests/cross/go-build/task.yaml b/tests/cross/go-build/task.yaml index aa92aee999f..7dddf99b457 100644 --- a/tests/cross/go-build/task.yaml +++ b/tests/cross/go-build/task.yaml @@ -37,10 +37,6 @@ prepare: | chown -R test:12345 /tmp/cross-build UBUNTU_ARCHIVE="http://archive.ubuntu.com/ubuntu/" - if [[ "$SPREAD_BACKEND" =~ google ]]; then - UBUNTU_ARCHIVE="http://$(cloud-id -l | cut -f2).gce.archive.ubuntu.com/ubuntu/" - fi - mv /etc/apt/sources.list.d/ubuntu.sources /etc/apt/sources.list.d/ubuntu.sources.orig mv /etc/apt/sources.list /etc/apt/sources.list.orig cat > /etc/apt/sources.list <<-EOF diff --git a/tests/lib/nested.sh b/tests/lib/nested.sh index c99e70ddd30..1df48086b46 100755 --- a/tests/lib/nested.sh +++ b/tests/lib/nested.sh @@ -1298,13 +1298,7 @@ nested_create_vm_service() { # use only 2G of RAM for qemu-nested # the caller can override PARAM_MEM local PARAM_MEM PARAM_SMP - if [ "$SPREAD_BACKEND" = "google-nested" ]; then - PARAM_MEM="-m ${NESTED_MEM:-4096}" - PARAM_SMP="-smp ${NESTED_CPUS:-2}" - elif [ "$SPREAD_BACKEND" = "google-nested-arm" ]; then - PARAM_MEM="-m ${NESTED_MEM:-4096}" - PARAM_SMP="-smp ${NESTED_CPUS:-3}" - elif [ "$SPREAD_BACKEND" = "qemu-nested" ] || [ "$SPREAD_BACKEND" = "garden" ]; then + if [ "$SPREAD_BACKEND" = "qemu-nested" ] || [ "$SPREAD_BACKEND" = "garden" ]; then PARAM_MEM="-m ${NESTED_MEM:-2048}" PARAM_SMP="-smp ${NESTED_CPUS:-1}" elif [[ "$SPREAD_BACKEND" = openstack* ]]; then @@ -1376,7 +1370,7 @@ nested_create_vm_service() { PARAM_REEXEC_ON_FAILURE="" if nested_is_core_lt 20; then - if [[ "$SPREAD_BACKEND" = google-nested* ]] || [[ "$SPREAD_BACKEND" = openstack* ]]; then + if [[ "$SPREAD_BACKEND" = openstack* ]]; then PARAM_MACHINE="-machine ubuntu${ATTR_KVM}" elif [ "$SPREAD_BACKEND" = "qemu-nested" ] || [ "$SPREAD_BACKEND" = "garden" ]; then # check if we have nested kvm diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh index 4383649a589..d72337fdad8 100755 --- a/tests/lib/prepare.sh +++ b/tests/lib/prepare.sh @@ -490,7 +490,7 @@ prepare_classic() { fi fi - # Some systems (google:ubuntu-16.04-64) ship with a broken sshguard + # Some systems ship with a broken sshguard # unit. Stop the broken unit to not confuse the "degraded-boot" test. # # Some other (debian-sid) fail in fwupd-refresh.service @@ -1628,7 +1628,7 @@ EOF # so for now, don't include snapd.debug=1, but eventually it would be # nice to have this on - if [[ "$SPREAD_BACKEND" =~ google ]] || [[ "$SPREAD_BACKEND" =~ openstack ]] || [[ "$SPREAD_BACKEND" =~ garden ]]; then + if [[ "$SPREAD_BACKEND" =~ openstack ]] || [[ "$SPREAD_BACKEND" =~ garden ]]; then # the default console settings for snapd aren't super useful in GCE, # instead it's more useful to have all console go to ttyS0 which we # can read more easily than tty1 for example diff --git a/tests/main/boot-state/task.yaml b/tests/main/boot-state/task.yaml index fcbac97aaca..cca04d1a0f1 100644 --- a/tests/main/boot-state/task.yaml +++ b/tests/main/boot-state/task.yaml @@ -4,7 +4,7 @@ details: | Verify the boot-state tool works properly. This tool is used to simplify the tests when working with the different boot managers. -backends: [google, qemu] +backends: [openstack, qemu] execute: | # Check help diff --git a/tests/main/cloud-init/task.yaml b/tests/main/cloud-init/task.yaml index 022ecfa5bc0..b84fd76d1c2 100644 --- a/tests/main/cloud-init/task.yaml +++ b/tests/main/cloud-init/task.yaml @@ -9,9 +9,9 @@ details: | systems: [-ubuntu-core-26*] skip: - - reason: This test is only valid for google and openstack backends that provide cloud info + - reason: This test is only valid for openstack backend that provide cloud info if: | - ! [[ "$SPREAD_BACKEND" =~ google ]] && ! [[ "$SPREAD_BACKEND" =~ openstack ]] + ! [[ "$SPREAD_BACKEND" =~ openstack ]] prepare: | cat < /etc/systemd/system/snapd.service.d/http-debug.conf @@ -26,7 +26,7 @@ restore: | execute: | if [[ ! -e /run/cloud-init/instance-data.json ]]; then - # we expect the test to run on all cloud images provided by google and openstack + # we expect the test to run on all cloud images provided by openstack echo "the test expected to have cloud-init instance data on $SPREAD_SYSTEM" exit 1 fi @@ -79,42 +79,21 @@ execute: | # force us to talk to the store so we can inspect the journal for logs snap info snapd - if [[ "$SPREAD_BACKEND" =~ google ]]; then - # GCE sets the following in Ubuntu images: - # { - # ... - # "v1": { - # "availability-zone": "us-east1-b", - # "availability_zone": "us-east1-b", - # "cloud-name": "gce", - # "cloud_name": "gce", - # "region": "us-east1" - # ... - # } - # } - snap_cloud_region=$(snap get core cloud.region) - test "$cloud_region" = "$snap_cloud_region" - - # verify that the region and availability zone is set in HTTP requests - journalctl -b -u snapd | MATCH "Snap-Device-Location: cloud-name=[\]*\"[a-z]+[\]*\" region=[\]*\"${cloud_region}[\]*\" availability-zone=[\]*\"${cloud_avzone}[\]*\"" - - elif [[ "$SPREAD_BACKEND" =~ openstack ]]; then - # Openstack sets the following in Ubuntu images: - # { - # ... - # "v1": { - # "availability-zone": "availability-zone-1", - # "availability_zone": "availability-zone-1", - # "cloud-name": "openstack", - # "cloud_name": "openstack", - # "region": null - # ... - # } - # } - # verify that the availability zone is set in HTTP requests - if [ "$cloud_region" == null ]; then - journalctl -b -u snapd | MATCH "Snap-Device-Location: cloud-name=[\]*\"${cloud_name}[\]*\" availability-zone=[\]*\"${cloud_avzone}[\]*\"" - else - journalctl -b -u snapd | MATCH "Snap-Device-Location: cloud-name=[\]*\"${cloud_name}[\]*\" region=[\]*\"${cloud_region}[\]*\" availability-zone=[\]*\"${cloud_avzone}[\]*\"" - fi + # Openstack sets the following in Ubuntu images: + # { + # ... + # "v1": { + # "availability-zone": "availability-zone-1", + # "availability_zone": "availability-zone-1", + # "cloud-name": "openstack", + # "cloud_name": "openstack", + # "region": null + # ... + # } + # } + # verify that the availability zone is set in HTTP requests + if [ "$cloud_region" == null ]; then + journalctl -b -u snapd | MATCH "Snap-Device-Location: cloud-name=[\]*\"${cloud_name}[\]*\" availability-zone=[\]*\"${cloud_avzone}[\]*\"" + else + journalctl -b -u snapd | MATCH "Snap-Device-Location: cloud-name=[\]*\"${cloud_name}[\]*\" region=[\]*\"${cloud_region}[\]*\" availability-zone=[\]*\"${cloud_avzone}[\]*\"" fi diff --git a/tests/main/interfaces-avahi-observe/task.yaml b/tests/main/interfaces-avahi-observe/task.yaml index 37e867c7bb6..3db11c61299 100644 --- a/tests/main/interfaces-avahi-observe/task.yaml +++ b/tests/main/interfaces-avahi-observe/task.yaml @@ -35,7 +35,7 @@ execute: | snap connect generic-consumer:avahi-observe echo "Then the snap is able to access avahi provided info" - # Support the 2 possible outputs for hostname in google machines + # Support the 2 possible outputs for hostname in openstack machines # jun221608-881720 # jun221608-881720.c.snapd-spread.internal hostname="$(hostname | cut -d . -f1)" diff --git a/tests/main/listing/task.yaml b/tests/main/listing/task.yaml index 62063cbd805..462a43dfd0c 100644 --- a/tests/main/listing/task.yaml +++ b/tests/main/listing/task.yaml @@ -36,12 +36,12 @@ execute: | NOTES=core #shellcheck disable=SC2166 - if [[ "$SPREAD_BACKEND" =~ google ]] || [[ "$SPREAD_BACKEND" =~ openstack ]] || [ "$SPREAD_BACKEND" == "qemu" ] && os.query is-core16; then + if [[ "$SPREAD_BACKEND" =~ openstack ]] || [ "$SPREAD_BACKEND" == "qemu" ] && os.query is-core16; then echo "With customized images the core snap is sideloaded" REV=$SIDELOAD_REV PUBLISHER=- - elif [[ "$SPREAD_BACKEND" =~ google ]] || [[ "$SPREAD_BACKEND" =~ openstack ]] || [ "$SPREAD_BACKEND" == "qemu" ] && os.query is-core-ge 18; then + elif [[ "$SPREAD_BACKEND" =~ openstack ]] || [ "$SPREAD_BACKEND" == "qemu" ] && os.query is-core-ge 18; then echo "With customized images the snapd snap is sideloaded" NAME=snapd VERSION=$SNAPD_GIT_VERSION diff --git a/tests/main/mount-ns/task.yaml b/tests/main/mount-ns/task.yaml index aa80bdbcfca..16c0318ef05 100644 --- a/tests/main/mount-ns/task.yaml +++ b/tests/main/mount-ns/task.yaml @@ -23,7 +23,7 @@ details: | --rename and --renumber, along with sorting options that combat non-deterministic mount order. - Unfortunately this test need separate data sets for google compute engine + Unfortunately this test need separate data sets for openstack and for qemu. The images are just slightly different, containing small tweaks that result in different initial host mount table. Such changes are further reflected in per-snap and per-user mount namespaces, since they @@ -46,7 +46,7 @@ details: | # The test is sensitive to backend type, which designates the used image. # Backends are enabled one-by-one along with the matching data set. -backends: [google] +backends: [openstack] # Temporary, exclude on ubuntu-16.04-64 until mount ns changes on 16.04 are understood/fixed systems: [ubuntu-18.04-64] diff --git a/tests/main/nss-modules/task.yaml b/tests/main/nss-modules/task.yaml index 1b3d1225c81..a9e057beb16 100644 --- a/tests/main/nss-modules/task.yaml +++ b/tests/main/nss-modules/task.yaml @@ -30,9 +30,6 @@ skip: - if: | [[ "$SPREAD_BACKEND" =~ openstack ]] && os.query is-arm && { [[ "$MODULE" = "nis" ]] || [[ "$MODULE" = "winbind" ]]; } reason: The nis and windbind variants are not supported on openstack arm due to lack of virtualization - - if: | - [[ "$SPREAD_BACKEND" =~ google ]] && { [[ "$MODULE" = "nis" ]] || [[ "$MODULE" = "winbind" ]]; } - reason: The nis and windbind variants are not supported on google due to lack of virtualization - if: | [[ "$SPREAD_SYSTEM" =~ ubuntu-18 ]] && { [[ "$MODULE" = "nis" ]] || [[ "$MODULE" = "winbind" ]]; } reason: The nis and windbind variants are not supported on ubuntu 18.04 due to a lack of a support of LXD VMs diff --git a/tests/main/snaps-state/task.yaml b/tests/main/snaps-state/task.yaml index 35e03b89f34..05ac91bb013 100644 --- a/tests/main/snaps-state/task.yaml +++ b/tests/main/snaps-state/task.yaml @@ -6,7 +6,7 @@ details: | and otherwise it tries from $TESTSLIB. Finally verifies that the confinement for the current system can be checked -backends: [google, qemu, openstack] +backends: [qemu, openstack] prepare: | snap set system experimental.parallel-instances=true diff --git a/tests/nightly/upload-snapd-to-gce/task.yaml b/tests/nightly/upload-snapd-to-gce/task.yaml deleted file mode 100644 index 3c7bc6012cc..00000000000 --- a/tests/nightly/upload-snapd-to-gce/task.yaml +++ /dev/null @@ -1,80 +0,0 @@ -summary: Upload snapd packages to gce bucket - -details: | - Upload the snapd packages to gce bucket - -systems: [ -ubuntu-core-*, -ubuntu-secboot-* ] - -manual: true - -prepare: | - if [ ! -f "$PROJECT_PATH/sa.json" ]; then - echo "Service account file needed to upload packages to gce bucket" - exit 1 - fi - - # Prepare to upload files to gs bucket - if ! command -v gcloud &>/dev/null; then - snap install --classic google-cloud-sdk - fi - gcloud auth activate-service-account --key-file="$PROJECT_PATH/sa.json" - rm -f "$PROJECT_PATH/sa.json" - -restore: | - rm -f "$PROJECT_PATH/sa.json" - -execute: | - PACKAGES_DIR="$SPREAD_SYSTEM" - PACKAGES_FILE="${PACKAGES_DIR}.tar" - BUCKET_FILE="gs://snapd-spread-tests/snapd-tests/packages/$PACKAGES_FILE" - - mkdir "$PACKAGES_DIR" - case "$SPREAD_SYSTEM" in - ubuntu-*|debian-*) - cp "$PROJECT_PATH"/../*.deb "$PACKAGES_DIR" - ;; - fedora-*|opensuse-*|amazon-*|centos-*) - rpm_dir=$(rpm --eval "%_topdir") - find "$rpm_dir"/RPMS -name '*.rpm' -exec cp -v {} "$PACKAGES_DIR" \; - cp "$rpm_dir"/SRPMS/snapd-*.src.rpm "$PACKAGES_DIR" - ;; - arch-*) - cp /tmp/pkg/snapd*.pkg.tar.* "$PACKAGES_DIR" - ;; - *) - echo "error: system $SPREAD_SYSTEM not supported" - exit 1 - ;; - esac - - ( cd "$PACKAGES_DIR" && tar -cvf "$PACKAGES_FILE" ./* ) - # Clean the packages for the system and upload the new ones - if gsutil ls "$BUCKET_FILE"; then - gsutil rm "$BUCKET_FILE" - fi - gsutil cp "${PACKAGES_DIR}/${PACKAGES_FILE}" "$BUCKET_FILE" - - # In case the system is ubuntu, also upload for ubuntu core systems - case "$SPREAD_SYSTEM" in - ubuntu-16.04-64) - CORE_PACKAGES_FILE=ubuntu-core-16-64.tar - ;; - ubuntu-18.04-64) - CORE_PACKAGES_FILE=ubuntu-core-18-64.tar - ;; - ubuntu-20.04-64) - CORE_PACKAGES_FILE=ubuntu-core-20-64.tar - ;; - ubuntu-22.04-64) - CORE_PACKAGES_FILE=ubuntu-core-22-64.tar - ;; - ubuntu-24.04-64) - CORE_PACKAGES_FILE=ubuntu-core-24-64.tar - ;; - *) - exit - ;; - esac - CORE_BUCKET_FILE="gs://snapd-spread-tests/snapd-tests/packages/$CORE_PACKAGES_FILE" - mv "${PACKAGES_DIR}/${PACKAGES_FILE}" "${PACKAGES_DIR}/${CORE_PACKAGES_FILE}" - gsutil cp "${PACKAGES_DIR}/${CORE_PACKAGES_FILE}" "$CORE_BUCKET_FILE" \ No newline at end of file diff --git a/tests/schemas/spread-schema.json b/tests/schemas/spread-schema.json index 00d61bd0c20..62c296a1433 100644 --- a/tests/schemas/spread-schema.json +++ b/tests/schemas/spread-schema.json @@ -25,7 +25,6 @@ "description": "Backend configurations for test execution", "additionalProperties": { "oneOf": [ - { "$ref": "#/definitions/googleBackend" }, { "$ref": "#/definitions/openstackBackend" }, { "$ref": "#/definitions/qemuBackend" }, { "$ref": "#/definitions/adhocBackend" }, @@ -123,27 +122,6 @@ ] } }, - "backendSystemsGoogle": { - "oneOf": [ - { - "type": "array", - "description": "List of systems (simple strings or objects)", - "items": { - "oneOf": [ - { "type": "string" }, - { "$ref": "#/definitions/systemConfigGoogle" } - ] - } - }, - { - "type": "object", - "description": "Systems defined as object with system name as key", - "additionalProperties": { - "$ref": "#/definitions/systemPropertiesGoogle" - } - } - ] - }, "backendSystemsOpenstack": { "oneOf": [ { @@ -228,50 +206,6 @@ } ] }, - "googleBackend": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "google", - "description": "Google backend type" - }, - "key": { - "type": "string", - "description": "Authentication key for the backend" - }, - "location": { - "type": "string", - "description": "Backend location/region" - }, - "plan": { - "type": "string", - "description": "Machine plan/type" - }, - "storage": { - "type": "string", - "description": "Storage allocation" - }, - "halt-timeout": { - "type": "string", - "description": "Time to wait before halting a machine", - "pattern": "^[0-9]+(s|m|h)$" - }, - "kill-timeout": { - "type": "string", - "description": "Time to wait before killing a task", - "pattern": "^[0-9]+(s|m|h)$" - }, - "environment": { - "$ref": "#/definitions/backendEnvironment" - }, - "systems": { - "$ref": "#/definitions/backendSystemsGoogle" - } - }, - "required": ["location"], - "additionalProperties": false - }, "openstackBackend": { "type": "object", "properties": { @@ -393,15 +327,6 @@ }, "additionalProperties": false }, - "systemConfigGoogle": { - "type": "object", - "patternProperties": { - "^[a-zA-Z0-9_.-]+$": { - "$ref": "#/definitions/systemPropertiesGoogle" - } - }, - "additionalProperties": false - }, "systemConfigOpenstack": { "type": "object", "patternProperties": { @@ -438,45 +363,6 @@ }, "additionalProperties": false }, - "systemPropertiesGoogle": { - "type": "object", - "properties": { - "image": { - "type": "string", - "description": "Base image name" - }, - "username": { - "type": "string", - "description": "SSH username" - }, - "password": { - "type": "string", - "description": "SSH password" - }, - "workers": { - "type": "integer", - "description": "Number of parallel workers", - "minimum": 1 - }, - "storage": { - "type": "string", - "description": "Storage allocation" - }, - "manual": { - "type": "boolean", - "description": "Manually triggered system" - }, - "secure-boot": { - "type": "boolean", - "description": "Enable secure boot" - }, - "attach-service-account": { - "type": "boolean", - "description": "Attach service account" - } - }, - "additionalProperties": false - }, "systemPropertiesOpenstack": { "type": "object", "properties": {