e2e ui: allow to choose elemental ui version

rancher · Feb 14, 2023 · d12fd17 · d12fd17
1 parent e7bb5fc
commit d12fd17
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 0 deletions.
diff --git a/.github/workflows/master-e2e.yaml b/.github/workflows/master-e2e.yaml
@@ -43,6 +43,10 @@ on:
         description: URL of the elemental support binary
         default: https://github.com/rancher/elemental-operator/releases/download/v1.0.0/elemental-support_1.0.0_linux_amd64
         type: string
+      elemental_ui_version:
+        description: Version of the elemental ui which will be installed
+        default: latest
+        type: string
       iso_to_test:
         description: ISO to test (default built one is empty)
         type: string
@@ -214,6 +218,7 @@ jobs:
           UI_ACCOUNT: ${{ inputs.ui_account }}
           BROWSER: chrome
           CYPRESS_DOCKER: 'cypress/included:10.9.0'
+          ELEMENTAL_UI_VERSION: ${{ inputs.elemental_ui_version }}
           RANCHER_PASSWORD: rancherpassword
           RANCHER_URL: https://${{ steps.installation.outputs.MY_HOSTNAME }}/dashboard
           RANCHER_USER: admin
@@ -394,6 +399,7 @@ jobs:
           echo "Rancher Manager Version: ${RM_VERSION}" >> $GITHUB_STEP_SUMMARY
           echo "Elemental Operator Upgrade: ${UPGRADE_OPERATOR_VALUE}" >> $GITHUB_STEP_SUMMARY
           echo "Elemental Operator Version: ${OPERATOR_VERSION}" >> $GITHUB_STEP_SUMMARY
+          echo "Elemental UI Extension Version (if applicable): ${{ inputs.elemental_ui_version || 'N/A'}}" >> $GITHUB_STEP_SUMMARY
           echo "K3s on Rancher Manager: ${{ env.INSTALL_K3S_VERSION }}" >> $GITHUB_STEP_SUMMARY
           echo "K3s/RKE2 version deployed on the cluster: ${{ inputs.k8s_version_to_provision }}" >> $GITHUB_STEP_SUMMARY
       - name: Send failed status to slack

diff --git a/.github/workflows/ui-e2e-k3s-latest.yaml b/.github/workflows/ui-e2e-k3s-latest.yaml
@@ -8,6 +8,10 @@ on:
         description: Destroy the auto-generated self-hosted runner
         default: true
         type: boolean
+      elemental_ui_version:
+        description: Version of the elemental ui which will be installed
+        default: latest
+        type: string
       proxy:
         description: Deploy a proxy (none/rancher/elemental)
         default: elemental
@@ -40,6 +44,7 @@ jobs:
     with:
       cluster_name: cluster-k3s
       destroy_runner: ${{ inputs.destroy_runner || true }}
+      elemental_ui_version: ${{ inputs.elemental_ui_version }}
       k8s_version_to_provision: v1.24.8+k3s1
       proxy: ${{ inputs.proxy || 'elemental' }}
       rancher_channel: ${{ inputs.rancher_channel || 'latest' }}

diff --git a/.github/workflows/ui-e2e-k3s-obs-Dev.yaml b/.github/workflows/ui-e2e-k3s-obs-Dev.yaml
@@ -7,6 +7,10 @@ on:
         description: Destroy the auto-generated self-hosted runner
         default: true
         type: boolean
+      elemental_ui_version:
+        description: Version of the elemental ui which will be installed
+        default: latest
+        type: string
       proxy:
         description: Deploy a proxy (none/rancher/elemental)
         default: elemental
@@ -38,6 +42,7 @@ jobs:
     with:
       cluster_name: cluster-k3s
       destroy_runner: ${{ inputs.destroy_runner }}
+      elemental_ui_version: ${{ inputs.elemental_ui_version }}
       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.24.8+k3s1
       proxy: ${{ inputs.proxy }}

diff --git a/.github/workflows/ui-e2e-k3s-obs-Stable.yaml b/.github/workflows/ui-e2e-k3s-obs-Stable.yaml
@@ -7,6 +7,10 @@ on:
         description: Destroy the auto-generated self-hosted runner
         default: true
         type: boolean
+      elemental_ui_version:
+        description: Version of the elemental ui which will be installed
+        default: latest
+        type: string
       proxy:
         description: Deploy a proxy (none/rancher/elemental)
         default: elemental
@@ -38,6 +42,7 @@ jobs:
     with:
       cluster_name: cluster-k3s
       destroy_runner: ${{ inputs.destroy_runner }}
+      elemental_ui_version: ${{ inputs.elemental_ui_version }}
       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.24.8+k3s1
       proxy: ${{ inputs.proxy }}

diff --git a/.github/workflows/ui-e2e-k3s-obs-Staging.yaml b/.github/workflows/ui-e2e-k3s-obs-Staging.yaml
@@ -7,6 +7,10 @@ on:
         description: Destroy the auto-generated self-hosted runner
         default: true
         type: boolean
+      elemental_ui_version:
+        description: Version of the elemental ui which will be installed
+        default: latest
+        type: string
       proxy:
         description: Deploy a proxy (none/rancher/elemental)
         default: elemental
@@ -38,6 +42,7 @@ jobs:
     with:
       cluster_name: cluster-k3s
       destroy_runner: ${{ inputs.destroy_runner }}
+      elemental_ui_version: ${{ inputs.elemental_ui_version }}
       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.24.8+k3s1
       proxy: ${{ inputs.proxy }}

diff --git a/.github/workflows/ui-e2e-k3s-stable.yaml b/.github/workflows/ui-e2e-k3s-stable.yaml
@@ -8,6 +8,10 @@ on:
         description: Destroy the auto-generated self-hosted runner
         default: true
         type: boolean
+      elemental_ui_version:
+        description: Version of the elemental ui which will be installed
+        default: latest
+        type: string
       proxy:
         description: Deploy a proxy (none/rancher/elemental)
         default: elemental
@@ -40,6 +44,7 @@ jobs:
     with:
       cluster_name: cluster-k3s
       destroy_runner: ${{ inputs.destroy_runner || true }}
+      elemental_ui_version: ${{ inputs.elemental_ui_version || 'latest' }}
       k8s_version_to_provision: v1.24.8+k3s1
       proxy: ${{ inputs.proxy || 'elemental' }}
       rancher_channel: ${{ inputs.rancher_channel || 'stable' }}

diff --git a/.github/workflows/ui-e2e-rke2-latest.yaml b/.github/workflows/ui-e2e-rke2-latest.yaml
@@ -8,6 +8,10 @@ on:
         description: Destroy the auto-generated self-hosted runner
         default: true
         type: boolean
+      elemental_ui_version:
+        description: Version of the elemental ui which will be installed
+        default: latest
+        type: string
       rancher_channel:
         description: Rancher Manager channel to use for installation (alpha/latest/stable)
         default: latest
@@ -40,6 +44,7 @@ jobs:
       ca_type: private
       cluster_name: cluster-rke2
       destroy_runner: ${{ inputs.destroy_runner || true }}
+      elemental_ui_version: ${{ inputs.elemental_ui_version || 'latest'}}
       k8s_version_to_provision: v1.24.8+rke2r1
       rancher_channel: ${{ inputs.rancher_channel || 'latest' }}
       rancher_version: ${{ inputs.rancher_version || 'devel' }}

diff --git a/.github/workflows/ui-e2e-rke2-obs-Dev.yaml b/.github/workflows/ui-e2e-rke2-obs-Dev.yaml
@@ -8,6 +8,10 @@ on:
         description: Destroy the auto-generated self-hosted runner
         default: true
         type: boolean
+      elemental_ui_version:
+        description: Version of the elemental ui which will be installed
+        default: latest
+        type: string
       rancher_channel:
         description: Rancher Manager channel to use for installation (alpha/latest/stable)
         default: stable
@@ -39,6 +43,7 @@ jobs:
       ca_type: private
       cluster_name: cluster-rke2
       destroy_runner: ${{ inputs.destroy_runner }}
+      elemental_ui_version: ${{ inputs.elemental_ui_version }}
       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.24.8+rke2r1
       rancher_channel: ${{ inputs.rancher_channel }}

diff --git a/.github/workflows/ui-e2e-rke2-obs-Stable.yaml b/.github/workflows/ui-e2e-rke2-obs-Stable.yaml
@@ -8,6 +8,10 @@ on:
         description: Destroy the auto-generated self-hosted runner
         default: true
         type: boolean
+      elemental_ui_version:
+        description: Version of the elemental ui which will be installed
+        default: latest
+        type: string
       rancher_channel:
         description: Rancher Manager channel to use for installation (alpha/latest/stable)
         default: latest
@@ -39,6 +43,7 @@ jobs:
       ca_type: private
       cluster_name: cluster-rke2
       destroy_runner: ${{ inputs.destroy_runner }}
+      elemental_ui_version: ${{ inputs.elemental_ui_version }}
       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.24.8+rke2r1
       rancher_channel: ${{ inputs.rancher_channel }}

diff --git a/.github/workflows/ui-e2e-rke2-obs-Staging.yaml b/.github/workflows/ui-e2e-rke2-obs-Staging.yaml
@@ -8,6 +8,10 @@ on:
         description: Destroy the auto-generated self-hosted runner
         default: true
         type: boolean
+      elemental_ui_version:
+        description: Version of the elemental ui which will be installed
+        default: latest
+        type: string
       rancher_channel:
         description: Rancher Manager channel to use for installation (alpha/latest/stable)
         default: stable
@@ -39,6 +43,7 @@ jobs:
       ca_type: private
       cluster_name: cluster-rke2
       destroy_runner: ${{ inputs.destroy_runner }}
+      elemental_ui_version: ${{ inputs.elemental_ui_version }}
       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.24.8+rke2r1
       rancher_channel: ${{ inputs.rancher_channel }}

diff --git a/.github/workflows/ui-e2e-rke2-stable.yaml b/.github/workflows/ui-e2e-rke2-stable.yaml
@@ -8,6 +8,10 @@ on:
         description: Destroy the auto-generated self-hosted runner
         default: true
         type: boolean
+      elemental_ui_version:
+        description: Version of the elemental ui which will be installed
+        default: latest
+        type: string
       rancher_channel:
         description: Rancher Manager channel to use for installation (alpha/latest/stable)
         default: stable
@@ -40,6 +44,7 @@ jobs:
       ca_type: private
       cluster_name: cluster-rke2
       destroy_runner: ${{ inputs.destroy_runner || true }}
+      elemental_ui_version: ${{ inputs.elemental_ui_version || 'latest' }}
       k8s_version_to_provision: v1.24.8+rke2r1
       rancher_channel: ${{ inputs.rancher_channel || 'stable' }}
       rancher_version: ${{ inputs.rancher_version || 'latest' }}

diff --git a/tests/cypress/e2e/unit_tests/elemental_plugin.spec.ts b/tests/cypress/e2e/unit_tests/elemental_plugin.spec.ts
@@ -6,6 +6,7 @@ Cypress.config();
 describe('Install Elemental plugin', () => {
   const topLevelMenu = new TopLevelMenu();
   const elemental = new Elemental();
+  const elemental_ui_version = Cypress.env('elemental_ui_version');
 
   beforeEach(() => {
     cy.login();
@@ -34,6 +35,10 @@ describe('Install Elemental plugin', () => {
     cy.contains('elemental');
     cy.get('.plugin').contains('Install').click();
     cy.contains('Install Extension elemental');
+    if (elemental_ui_version != 'latest') {
+      cy.get('.labeled-select').click();
+      cy.contains(elemental_ui_version).click();
+    }
     cy.clickButton('Install');
     cy.contains('Installing');
     cy.contains('Extensions changed - reload required', {timeout: 40000});

diff --git a/tests/cypress/plugins/index.ts b/tests/cypress/plugins/index.ts
@@ -23,6 +23,7 @@ module.exports = (on: Cypress.PluginEvents, config: Cypress.PluginConfigOptions)
   config.env.operator_version = process.env.OPERATOR_VERSION;
   config.env.proxy = process.env.PROXY;
   config.env.proxy_ip = process.env.PROXY_IP;
+  config.env.elemental_ui_version = process.env.ELEMENTAL_UI_VERSION;
 
   return config;
 };
diff --git a/tests/scripts/start-cypress-tests b/tests/scripts/start-cypress-tests
@@ -19,6 +19,7 @@ docker run -v $PWD:/e2e -w /e2e                            \
     -e K8S_VERSION_TO_PROVISION=$K8S_VERSION_TO_PROVISION  \
     -e UI_ACCOUNT=$UI_ACCOUNT                              \
     -e OPERATOR_VERSION=$OPERATOR_VERSION                  \
+    -e ELEMENTAL_UI_VERSION=$ELEMENTAL_UI_VERSION          \
     -e PROXY=$PROXY                                        \
     --add-host host.docker.internal:host-gateway           \
     --ipc=host                                             \