ci/e2e: change Elemental operator install/upgrade stack

Signed-off-by: Loic Devulder <ldevulder@suse.com>
rancher · Apr 24, 2023 · 2ce9bc1 · 2ce9bc1
1 parent a58d243
commit 2ce9bc1
Show file tree

Hide file tree

Showing 33 changed files with 110 additions and 159 deletions.
diff --git a/.github/workflows/cli-k3s-os-upgrade-rancher_latest.yaml b/.github/workflows/cli-k3s-os-upgrade-rancher_latest.yaml
@@ -22,10 +22,11 @@ jobs:
       k8s_version_to_provision: v1.25.7+k3s1
       # Force to only deploy the first 3 nodes
       node_number: 3
+      operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher/elemental-operator-chart
+      operator_version: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
       rancher_channel: latest
       rancher_version: devel
       runner_template: elemental-e2e-ci-runner-spot-x86-64-template-n2-standard-8-v4
       upgrade_channel_list: registry.opensuse.org/isv/rancher/elemental/dev/teal53/15.4/rancher/elemental-teal-dev-channel/5.3:latest
       upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/teal53/15.4/rancher/elemental-teal/5.3:latest
-      upgrade_operator: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
       upgrade_os_channel: dev
diff --git a/.github/workflows/cli-k3s-os-upgrade-rancher_stable.yaml b/.github/workflows/cli-k3s-os-upgrade-rancher_stable.yaml
@@ -22,10 +22,11 @@ jobs:
       k8s_version_to_provision: v1.25.7+k3s1
       # Force to only deploy the first 3 nodes
       node_number: 3
+      operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher/elemental-operator-chart
+      operator_version: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
       rancher_channel: stable
       rancher_version: latest
       runner_template: elemental-e2e-ci-runner-spot-x86-64-template-n2-standard-8-v4
       upgrade_channel_list: registry.opensuse.org/isv/rancher/elemental/dev/teal53/15.4/rancher/elemental-teal-dev-channel/5.3:latest
       upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/teal53/15.4/rancher/elemental-teal/5.3:latest
-      upgrade_operator: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
       upgrade_os_channel: dev
diff --git a/.github/workflows/cli-k3s-os-upgrade.yaml b/.github/workflows/cli-k3s-os-upgrade.yaml
@@ -20,10 +20,6 @@ on:
         description: Rancher Manager version to use for installation (fixed version or latest)
         default: latest
         type: string
-      upgrade_operator:
-        description: URL to elemental-operator version to upgrade to
-        default: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
-        type: string
       upgrade_os_channel:
         description: Channel to use for the Elemental OS upgrade
         default: dev
@@ -48,10 +44,11 @@ jobs:
       k8s_version_to_provision: v1.25.7+k3s1
       # Force to only deploy the first 3 nodes
       node_number: 3
+      operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/${{ inputs.upgrade_os_channel }}/charts/rancher/elemental-operator-chart
+      operator_version: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
       rancher_channel: ${{ inputs.rancher_channel }}
       rancher_version: ${{ inputs.rancher_version }}
       runner_template: elemental-e2e-ci-runner-spot-x86-64-template-n2-standard-8-v4
       upgrade_channel_list: registry.opensuse.org/isv/rancher/elemental/dev/teal53/15.4/rancher/elemental-teal-dev-channel/5.3:latest
       upgrade_image: registry.opensuse.org/isv/rancher/elemental/${{ inputs.upgrade_os_channel }}/teal53/15.4/rancher/elemental-teal/5.3:latest
-      upgrade_operator: ${{ inputs.upgrade_operator }}
       upgrade_os_channel: ${{ inputs.upgrade_os_channel }}
diff --git a/.github/workflows/cli-obs-manual-workflow.yaml b/.github/workflows/cli-obs-manual-workflow.yaml
@@ -23,6 +23,10 @@ on:
         description: Number of nodes (>3) to deploy on the provisioned cluster
         default: 5
         type: number
+      operator_version:
+        description: Elemental operator version to use
+        default: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher/elemental-operator-chart
+        type: string
       rancher_channel:
         description: Rancher Manager channel to use for installation (alpha/latest/stable)
         default: stable
@@ -39,10 +43,6 @@ on:
         description: Defines if bootstrapping is done sequentially (true) or in parallel (false)
         default: false
         type: string
-      upgrade_operator:
-        description: URL to elemental-operator version to upgrade to
-        default: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher/elemental-operator-chart
-        type: string
 
 concurrency:
   group: cli-obs-manual-workflow-${{ github.head_ref || github.ref }}-${{ github.repository }}
@@ -63,8 +63,8 @@ jobs:
       iso_to_test: ${{ inputs.iso_to_test }}
       k8s_version_to_provision: ${{ inputs.k8s_version_to_provision }}
       node_number: ${{ inputs.node_number }}
+      operator_version: ${{ inputs.operator_version }}
       rancher_channel: ${{ inputs.rancher_channel }}
       rancher_version: ${{ inputs.rancher_version }}
       runner_template: ${{ inputs.runner_template }}
       sequential: ${{ inputs.sequential }}
-      upgrade_operator: ${{ inputs.upgrade_operator }}
diff --git a/.github/workflows/cli-rke2-os-upgrade-rancher_latest.yaml b/.github/workflows/cli-rke2-os-upgrade-rancher_latest.yaml
@@ -23,10 +23,11 @@ jobs:
       k8s_version_to_provision: v1.25.7+rke2r1
       # Force to only deploy the first 3 nodes
       node_number: 3
+      operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher/elemental-operator-chart
+      operator_version: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
       rancher_channel: latest
       rancher_version: devel
       runner_template: elemental-e2e-ci-runner-spot-x86-64-template-n2-standard-8-v4
       upgrade_channel_list: registry.opensuse.org/isv/rancher/elemental/dev/teal53/15.4/rancher/elemental-teal-dev-channel/5.3:latest
       upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/teal53/15.4/rancher/elemental-teal/5.3:latest
-      upgrade_operator: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
       upgrade_os_channel: dev
diff --git a/.github/workflows/cli-rke2-os-upgrade-rancher_stable.yaml b/.github/workflows/cli-rke2-os-upgrade-rancher_stable.yaml
@@ -23,10 +23,11 @@ jobs:
       k8s_version_to_provision: v1.25.7+rke2r1
       # Force to only deploy the first 3 nodes
       node_number: 3
+      operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher/elemental-operator-chart
+      operator_version: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
       rancher_channel: stable
       rancher_version: latest
       runner_template: elemental-e2e-ci-runner-spot-x86-64-template-n2-standard-8-v4
       upgrade_channel_list: registry.opensuse.org/isv/rancher/elemental/dev/teal53/15.4/rancher/elemental-teal-dev-channel/5.3:latest
       upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/teal53/15.4/rancher/elemental-teal/5.3:latest
-      upgrade_operator: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
       upgrade_os_channel: dev
diff --git a/.github/workflows/cli-rke2-os-upgrade.yaml b/.github/workflows/cli-rke2-os-upgrade.yaml
@@ -20,10 +20,6 @@ on:
         description: Rancher Manager version to use for installation (fixed version or latest)
         default: latest
         type: string
-      upgrade_operator:
-        description: URL to elemental-operator version to upgrade to
-        default: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
-        type: string
       upgrade_os_channel:
         description: Channel to use for the Elemental OS upgrade
         default: dev
@@ -49,10 +45,11 @@ jobs:
       k8s_version_to_provision: v1.25.7+rke2r1
       # Force to only deploy the first 3 nodes
       node_number: 3
+      operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/${{ inputs.upgrade_os_channel }}/charts/rancher/elemental-operator-chart
+      operator_version: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
       rancher_channel: ${{ inputs.rancher_channel }}
       rancher_version: ${{ inputs.rancher_version }}
       runner_template: elemental-e2e-ci-runner-spot-x86-64-template-n2-standard-8-v4
       upgrade_channel_list: registry.opensuse.org/isv/rancher/elemental/dev/teal53/15.4/rancher/elemental-teal-dev-channel/5.3:latest
       upgrade_image: registry.opensuse.org/isv/rancher/elemental/${{ inputs.upgrade_os_channel }}/teal53/15.4/rancher/elemental-teal/5.3:latest
-      upgrade_operator: ${{ inputs.upgrade_operator }}
       upgrade_os_channel: ${{ inputs.upgrade_os_channel }}
diff --git a/.github/workflows/e2e-k3s-obs-Dev.yaml b/.github/workflows/e2e-k3s-obs-Dev.yaml
@@ -19,10 +19,6 @@ on:
         description: Rancher Manager version to use for installation (fixed version or latest)
         default: latest
         type: string
-      upgrade_operator:
-        description: URL to elemental-operator version to upgrade to
-        default: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher/elemental-operator-chart
-        type: string
       upstream_k3s_version:
         description: Cluster upstream K3s version where to install Rancher
         type: string
@@ -45,7 +41,7 @@ jobs:
       destroy_runner: ${{ inputs.destroy_runner }}
       iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Dev:/Teal53/media/iso/elemental-teal.x86_64.iso
       k8s_version_to_provision: v1.25.7+k3s1
+      operator_version: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher/elemental-operator-chart
       rancher_channel: ${{ inputs.rancher_channel }}
       rancher_version: ${{ inputs.rancher_version }}
-      upgrade_operator: ${{ inputs.upgrade_operator }}
       upstream_k3s_version: ${{ inputs.upstream_k3s_version }}
diff --git a/.github/workflows/e2e-k3s-obs-Stable.yaml b/.github/workflows/e2e-k3s-obs-Stable.yaml
@@ -19,10 +19,6 @@ on:
         description: Rancher Manager version to use for installation (fixed version or latest)
         default: latest
         type: string
-      upgrade_operator:
-        description: URL to elemental-operator version to upgrade to
-        default: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
-        type: string
       upstream_k3s_version:
         description: Cluster upstream K3s version where to install Rancher
         type: string
@@ -45,7 +41,7 @@ jobs:
       destroy_runner: ${{ inputs.destroy_runner }}
       iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Stable:/Teal53/media/iso/elemental-teal.x86_64.iso
       k8s_version_to_provision: v1.25.7+k3s1
+      operator_version: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
       rancher_channel: ${{ inputs.rancher_channel }}
       rancher_version: ${{ inputs.rancher_version }}
-      upgrade_operator: ${{ inputs.upgrade_operator }}
       upstream_k3s_version: ${{ inputs.upstream_k3s_version }}
diff --git a/.github/workflows/e2e-k3s-obs-Staging.yaml b/.github/workflows/e2e-k3s-obs-Staging.yaml
@@ -19,10 +19,6 @@ on:
         description: Rancher Manager version to use for installation (fixed version or latest)
         default: latest
         type: string
-      upgrade_operator:
-        description: URL to elemental-operator version to upgrade to
-        default: oci://registry.opensuse.org/isv/rancher/elemental/staging/charts/rancher/elemental-operator-chart
-        type: string
       upstream_k3s_version:
         description: Cluster upstream K3s version where to install Rancher
         type: string
@@ -45,7 +41,7 @@ jobs:
       destroy_runner: ${{ inputs.destroy_runner }}
       iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Staging:/Teal53/media/iso/elemental-teal.x86_64.iso
       k8s_version_to_provision: v1.25.7+k3s1
+      operator_version: oci://registry.opensuse.org/isv/rancher/elemental/staging/charts/rancher/elemental-operator-chart
       rancher_channel: ${{ inputs.rancher_channel }}
       rancher_version: ${{ inputs.rancher_version }}
-      upgrade_operator: ${{ inputs.upgrade_operator }}
       upstream_k3s_version: ${{ inputs.upstream_k3s_version }}
diff --git a/.github/workflows/e2e-rke2-obs-Dev.yaml b/.github/workflows/e2e-rke2-obs-Dev.yaml
@@ -16,10 +16,6 @@ on:
         description: Rancher Manager version to use for installation (fixed version or latest)
         default: latest
         type: string
-      upgrade_operator:
-        description: URL to elemental-operator version to upgrade to
-        default: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher/elemental-operator-chart
-        type: string
 
 concurrency:
   group: e2e-rke2-obs-dev-${{ github.head_ref || github.ref }}-${{ github.repository }}
@@ -39,6 +35,6 @@ jobs:
       destroy_runner: ${{ inputs.destroy_runner }}
       iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Dev:/Teal53/media/iso/elemental-teal.x86_64.iso
       k8s_version_to_provision: v1.25.7+rke2r1
+      operator_version: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher/elemental-operator-chart
       rancher_channel: ${{ inputs.rancher_channel }}
       rancher_version: ${{ inputs.rancher_version }}
-      upgrade_operator: ${{ inputs.upgrade_operator }}
diff --git a/.github/workflows/e2e-rke2-obs-Stable.yaml b/.github/workflows/e2e-rke2-obs-Stable.yaml
@@ -16,10 +16,6 @@ on:
         description: Rancher Manager version to use for installation (fixed version or latest)
         default: latest
         type: string
-      upgrade_operator:
-        description: URL to elemental-operator version to upgrade to
-        default: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
-        type: string
 
 concurrency:
   group: e2e-rke2-obs-stable-${{ github.head_ref || github.ref }}-${{ github.repository }}
@@ -39,6 +35,6 @@ jobs:
       destroy_runner: ${{ inputs.destroy_runner }}
       iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Stable:/Teal53/media/iso/elemental-teal.x86_64.iso
       k8s_version_to_provision: v1.25.7+rke2r1
+      operator_version: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher/elemental-operator-chart
       rancher_channel: ${{ inputs.rancher_channel }}
       rancher_version: ${{ inputs.rancher_version }}
-      upgrade_operator: ${{ inputs.upgrade_operator }}
diff --git a/.github/workflows/e2e-rke2-obs-Staging.yaml b/.github/workflows/e2e-rke2-obs-Staging.yaml
@@ -16,10 +16,6 @@ on:
         description: Rancher Manager version to use for installation (fixed version or latest)
         default: latest
         type: string
-      upgrade_operator:
-        description: URL to elemental-operator version to upgrade to
-        default: oci://registry.opensuse.org/isv/rancher/elemental/staging/charts/rancher/elemental-operator-chart
-        type: string
 
 concurrency:
   group: e2e-rke2-obs-staging-${{ github.head_ref || github.ref }}-${{ github.repository }}
@@ -39,6 +35,6 @@ jobs:
       destroy_runner: ${{ inputs.destroy_runner }}
       iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Staging:/Teal53/media/iso/elemental-teal.x86_64.iso
       k8s_version_to_provision: v1.25.7+rke2r1
+      operator_version: oci://registry.opensuse.org/isv/rancher/elemental/staging/charts/rancher/elemental-operator-chart
       rancher_channel: ${{ inputs.rancher_channel }}
       rancher_version: ${{ inputs.rancher_version }}
-      upgrade_operator: ${{ inputs.upgrade_operator }}