From 9baac13463ceec36a7c58dfd2a64b360ea96c8ad Mon Sep 17 00:00:00 2001 From: Loic Devulder Date: Wed, 28 Feb 2024 17:31:58 +0100 Subject: [PATCH] ci: use correct container path for upgrade tests Signed-off-by: Loic Devulder --- .github/workflows/cli-k3s-hardened-upgrade-reset-rm_stable.yaml | 2 +- .github/workflows/cli-k3s-os-upgrade-rm_stable.yaml | 2 +- .github/workflows/cli-k3s-os-upgrade.yaml | 2 +- .../workflows/cli-rke2-hardened-upgrade-reset-rm_stable.yaml | 2 +- .github/workflows/cli-rke2-os-upgrade-rm_stable.yaml | 2 +- .github/workflows/cli-rke2-os-upgrade.yaml | 2 +- .github/workflows/ui-k3s-os-upgrade-rm_head_2.7.yaml | 2 +- .github/workflows/ui-k3s-os-upgrade-rm_head_2.8.yaml | 2 +- .github/workflows/ui-k3s-os-upgrade-rm_head_2.9.yaml | 2 +- .github/workflows/ui-k3s-os-upgrade-rm_stable.yaml | 2 +- .github/workflows/ui-k3s-os-upgrade.yaml | 2 +- .github/workflows/ui-rke2-os-upgrade-rm_head_2.7.yaml | 2 +- .github/workflows/ui-rke2-os-upgrade-rm_head_2.8.yaml | 2 +- .github/workflows/ui-rke2-os-upgrade-rm_head_2.9.yaml | 2 +- .github/workflows/ui-rke2-os-upgrade-rm_stable.yaml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/cli-k3s-hardened-upgrade-reset-rm_stable.yaml b/.github/workflows/cli-k3s-hardened-upgrade-reset-rm_stable.yaml index 70d1fa5ea..a947387be 100644 --- a/.github/workflows/cli-k3s-hardened-upgrade-reset-rm_stable.yaml +++ b/.github/workflows/cli-k3s-hardened-upgrade-reset-rm_stable.yaml @@ -32,5 +32,5 @@ jobs: rancher_version: stable/latest/none reset: true test_type: cli - upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-iso-5.5:latest + upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-container-5.5:latest upgrade_os_channel: dev diff --git a/.github/workflows/cli-k3s-os-upgrade-rm_stable.yaml b/.github/workflows/cli-k3s-os-upgrade-rm_stable.yaml index b83050c28..8f247f616 100644 --- a/.github/workflows/cli-k3s-os-upgrade-rm_stable.yaml +++ b/.github/workflows/cli-k3s-os-upgrade-rm_stable.yaml @@ -29,5 +29,5 @@ jobs: rancher_upgrade: latest/devel/2.8 rancher_version: stable/latest/none test_type: cli - upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-iso-5.5:latest + upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-container-5.5:latest upgrade_os_channel: dev diff --git a/.github/workflows/cli-k3s-os-upgrade.yaml b/.github/workflows/cli-k3s-os-upgrade.yaml index f22e12a67..01c06f95f 100644 --- a/.github/workflows/cli-k3s-os-upgrade.yaml +++ b/.github/workflows/cli-k3s-os-upgrade.yaml @@ -56,5 +56,5 @@ jobs: rancher_upgrade: ${{ inputs.rancher_upgrade }} rancher_version: ${{ inputs.rancher_version }} test_type: cli - upgrade_image: registry.opensuse.org/isv/rancher/elemental/${{ inputs.upgrade_os_channel }}/containers/suse/sle-micro/sle-micro-iso-${{ inputs.slem_version }}:latest + upgrade_image: registry.opensuse.org/isv/rancher/elemental/${{ inputs.upgrade_os_channel }}/containers/suse/sle-micro/sle-micro-container-${{ inputs.slem_version }}:latest upgrade_os_channel: ${{ inputs.upgrade_os_channel }} diff --git a/.github/workflows/cli-rke2-hardened-upgrade-reset-rm_stable.yaml b/.github/workflows/cli-rke2-hardened-upgrade-reset-rm_stable.yaml index e63ee68c4..e23b674d9 100644 --- a/.github/workflows/cli-rke2-hardened-upgrade-reset-rm_stable.yaml +++ b/.github/workflows/cli-rke2-hardened-upgrade-reset-rm_stable.yaml @@ -32,6 +32,6 @@ jobs: rancher_version: stable/latest/none reset: true test_type: cli - upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-iso-5.5:latest + upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-container-5.5:latest upgrade_os_channel: dev upstream_cluster_version: v1.26.10+rke2r2 diff --git a/.github/workflows/cli-rke2-os-upgrade-rm_stable.yaml b/.github/workflows/cli-rke2-os-upgrade-rm_stable.yaml index d2ff0f162..af9c392e0 100644 --- a/.github/workflows/cli-rke2-os-upgrade-rm_stable.yaml +++ b/.github/workflows/cli-rke2-os-upgrade-rm_stable.yaml @@ -30,6 +30,6 @@ jobs: rancher_upgrade: latest/devel/2.8 rancher_version: stable/latest/none test_type: cli - upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-iso-5.5:latest + upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-container-5.5:latest upgrade_os_channel: dev upstream_cluster_version: v1.26.10+rke2r2 diff --git a/.github/workflows/cli-rke2-os-upgrade.yaml b/.github/workflows/cli-rke2-os-upgrade.yaml index 66ed75345..318397e5b 100644 --- a/.github/workflows/cli-rke2-os-upgrade.yaml +++ b/.github/workflows/cli-rke2-os-upgrade.yaml @@ -57,6 +57,6 @@ jobs: rancher_upgrade: ${{ inputs.rancher_upgrade }} rancher_version: ${{ inputs.rancher_version }} test_type: cli - upgrade_image: registry.opensuse.org/isv/rancher/elemental/${{ inputs.upgrade_os_channel }}/containers/suse/sle-micro/sle-micro-iso-${{ inputs.slem_version }}:latest + upgrade_image: registry.opensuse.org/isv/rancher/elemental/${{ inputs.upgrade_os_channel }}/containers/suse/sle-micro/sle-micro-container-${{ inputs.slem_version }}:latest upgrade_os_channel: ${{ inputs.upgrade_os_channel }} upstream_cluster_version: v1.26.10+rke2r2 diff --git a/.github/workflows/ui-k3s-os-upgrade-rm_head_2.7.yaml b/.github/workflows/ui-k3s-os-upgrade-rm_head_2.7.yaml index 27b47514c..5a1f7f8ca 100644 --- a/.github/workflows/ui-k3s-os-upgrade-rm_head_2.7.yaml +++ b/.github/workflows/ui-k3s-os-upgrade-rm_head_2.7.yaml @@ -42,4 +42,4 @@ jobs: proxy: ${{ inputs.proxy || 'elemental' }} rancher_version: ${{ inputs.rancher_version || 'latest/devel/2.7' }} test_type: ui - upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-iso-5.5:latest + upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-container-5.5:latest diff --git a/.github/workflows/ui-k3s-os-upgrade-rm_head_2.8.yaml b/.github/workflows/ui-k3s-os-upgrade-rm_head_2.8.yaml index 4b061637e..b3cc46b99 100644 --- a/.github/workflows/ui-k3s-os-upgrade-rm_head_2.8.yaml +++ b/.github/workflows/ui-k3s-os-upgrade-rm_head_2.8.yaml @@ -42,4 +42,4 @@ jobs: proxy: ${{ inputs.proxy || 'elemental' }} rancher_version: ${{ inputs.rancher_version || 'latest/devel/2.8' }} test_type: ui - upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-iso-5.5:latest + upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-container-5.5:latest diff --git a/.github/workflows/ui-k3s-os-upgrade-rm_head_2.9.yaml b/.github/workflows/ui-k3s-os-upgrade-rm_head_2.9.yaml index 89fa12a3f..9cf810b33 100644 --- a/.github/workflows/ui-k3s-os-upgrade-rm_head_2.9.yaml +++ b/.github/workflows/ui-k3s-os-upgrade-rm_head_2.9.yaml @@ -42,4 +42,4 @@ jobs: proxy: ${{ inputs.proxy || 'elemental' }} rancher_version: ${{ inputs.rancher_version || 'latest/devel/2.9' }} test_type: ui - upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-iso-5.5:latest + upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-container-5.5:latest diff --git a/.github/workflows/ui-k3s-os-upgrade-rm_stable.yaml b/.github/workflows/ui-k3s-os-upgrade-rm_stable.yaml index 675e3d2df..b00eae813 100644 --- a/.github/workflows/ui-k3s-os-upgrade-rm_stable.yaml +++ b/.github/workflows/ui-k3s-os-upgrade-rm_stable.yaml @@ -35,4 +35,4 @@ jobs: proxy: ${{ inputs.proxy || 'elemental' }} rancher_version: ${{ inputs.rancher_version || 'stable/latest/none' }} test_type: ui - upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-iso-5.5:latest + upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-container-5.5:latest diff --git a/.github/workflows/ui-k3s-os-upgrade.yaml b/.github/workflows/ui-k3s-os-upgrade.yaml index aaced7746..90ab9cd2d 100644 --- a/.github/workflows/ui-k3s-os-upgrade.yaml +++ b/.github/workflows/ui-k3s-os-upgrade.yaml @@ -23,7 +23,7 @@ on: # Test OS upgrade with OS image in this test ("Use image from registry") upgrade_image: description: Upgrade image to use - default: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-iso-5.5:latest + default: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-container-5.5:latest type: string jobs: diff --git a/.github/workflows/ui-rke2-os-upgrade-rm_head_2.7.yaml b/.github/workflows/ui-rke2-os-upgrade-rm_head_2.7.yaml index a3776462d..0ee94a8c1 100644 --- a/.github/workflows/ui-rke2-os-upgrade-rm_head_2.7.yaml +++ b/.github/workflows/ui-rke2-os-upgrade-rm_head_2.7.yaml @@ -39,6 +39,6 @@ jobs: k8s_version_to_provision: v1.27.10+rke2r1 rancher_version: ${{ inputs.rancher_version || 'latest/devel/2.7' }} test_type: ui - upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-iso-5.5:latest + upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-container-5.5:latest upgrade_os_channel: dev upstream_cluster_version: v1.26.10+rke2r2 diff --git a/.github/workflows/ui-rke2-os-upgrade-rm_head_2.8.yaml b/.github/workflows/ui-rke2-os-upgrade-rm_head_2.8.yaml index 65e6c4f33..922121670 100644 --- a/.github/workflows/ui-rke2-os-upgrade-rm_head_2.8.yaml +++ b/.github/workflows/ui-rke2-os-upgrade-rm_head_2.8.yaml @@ -39,6 +39,6 @@ jobs: k8s_version_to_provision: v1.27.10+rke2r1 rancher_version: ${{ inputs.rancher_version || 'latest/devel/2.8' }} test_type: ui - upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-iso-5.5:latest + upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-container-5.5:latest upgrade_os_channel: dev upstream_cluster_version: v1.26.10+rke2r2 diff --git a/.github/workflows/ui-rke2-os-upgrade-rm_head_2.9.yaml b/.github/workflows/ui-rke2-os-upgrade-rm_head_2.9.yaml index 52ca13360..f37ac0800 100644 --- a/.github/workflows/ui-rke2-os-upgrade-rm_head_2.9.yaml +++ b/.github/workflows/ui-rke2-os-upgrade-rm_head_2.9.yaml @@ -39,6 +39,6 @@ jobs: k8s_version_to_provision: v1.27.10+rke2r1 rancher_version: ${{ inputs.rancher_version || 'latest/devel/2.9' }} test_type: ui - upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-iso-5.5:latest + upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-container-5.5:latest upgrade_os_channel: dev upstream_cluster_version: v1.26.10+rke2r2 diff --git a/.github/workflows/ui-rke2-os-upgrade-rm_stable.yaml b/.github/workflows/ui-rke2-os-upgrade-rm_stable.yaml index 05b4f61f9..ae716ca30 100644 --- a/.github/workflows/ui-rke2-os-upgrade-rm_stable.yaml +++ b/.github/workflows/ui-rke2-os-upgrade-rm_stable.yaml @@ -40,6 +40,6 @@ jobs: k8s_version_to_provision: v1.27.10+rke2r1 rancher_version: ${{ inputs.rancher_version || 'stable/latest/none' }} test_type: ui - upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-iso-5.5:latest + upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/suse/sle-micro/sle-micro-container-5.5:latest upgrade_os_channel: dev upstream_cluster_version: v1.26.10+rke2r2