ci: use correct container path for upgrade tests

Signed-off-by: Loic Devulder <ldevulder@suse.com>
rancher · Feb 28, 2024 · 9baac13 · 9baac13
1 parent df7a307
commit 9baac13
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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