Merge branch 'feature/ARTESCA-13969' into tmp/octopus/w/130.0/feature…

…/ARTESCA-13969

.github/actions/bastion-ui-tests/action.yaml

@@ -5,7 +5,7 @@ inputs:
   TEST_FILTERS:
     description: "The test filter to use"
     required: false
-    default: "e2e"
+    default: "integration"
   TARGET_URL:
     description: "The URL to reach the UI"
     required: false
@@ -18,17 +18,31 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: Install Chromium on Bastion
+      uses: ./.github/actions/run-command-ssh
+      with:
+        NODE: bastion
+        COMMAND: |
+          sudo yum clean all
+          sudo yum install -y epel-release
+          sudo yum -y update
+          sudo yum install -y chromium
+
     - name: Run UI tests from Bastion
       uses: ./.github/actions/run-command-ssh
       with:
         NODE: bastion
         COMMAND: |
           cd metalk8s/ui
           rm -rf babel.config.js
+          #replace http://localhost in cypress/fixtures/deployed-ui-apps.json by ${{ inputs.TARGET_URL }}
+          sed -i 's|http://localhost|${{ inputs.TARGET_URL }}|g' cypress/fixtures/deployed-ui-apps.json
           CYPRESS_BASE_URL=\"${{ inputs.TARGET_URL }}\" npm run \"test:${{ inputs.TEST_FILTERS }}\"
+
     - name: Create dest directory
       shell: bash
       run: mkdir -p "${{ inputs.DEST_DIR }}"
+
     - name: Collect cypress screenshots from Bastion
       shell: bash
       env:

.github/actions/destroy-cluster/action.yaml

@@ -98,6 +98,7 @@ runs:
       shell: bash
       env:
         TF_VAR_cloud: ${{ inputs.CLOUD }}
+        TF_VAR_flavors_map: '{ ovh = { default = "d2-8", bastion = "b3-16" } }'
         MAX_RETRIES: "20"
       run: |
         for try in $(seq 1 ${MAX_RETRIES}); do

.github/actions/spawn-cluster/action.yaml

@@ -134,6 +134,7 @@ runs:
         TF_VAR_rhsm_username: "${{ inputs.rhsm-username }}"
         TF_VAR_rhsm_password: "${{ inputs.rhsm-password }}"
         TF_VAR_ingress_remote_ip_prefix: "${{ inputs.AUTHORIZED_CIDRS }}"
+        TF_VAR_flavors_map: '{ ovh = { default = "d2-8", bastion = "b3-16" } }'
         MAX_RETRIES: "3"
         TFVARS_DIR: "${{ github.workspace }}/.github/spawn/tfvars"
       run: |

.github/workflows/pre-merge.yaml

@@ -420,7 +420,7 @@ jobs:
           tags: ghcr.io/${{ github.repository_owner }}/metalk8s-nginx-integration-tests:${{ github.sha }}
 
   integration_tests_ui:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04-8core
     needs:
       - build_integration_container_nginx
       - changed-files
@@ -456,7 +456,7 @@ jobs:
       - name: Install Cypress and its dependencies
         run: |
           cd ui
-          PKGS="har-validator cypress cypress-cucumber-preprocessor cypress-wait-until @testing-library/cypress"
+          PKGS="har-validator cypress cypress-wait-until @testing-library/cypress querystring"
           for pkg in $PKGS; do
             npm install --no-save --no-package-lock --legacy-peer-deps $pkg@$(node -p \
               -e "require('./package-lock.json').dependencies['$pkg'].version" \

VERSION

@@ -1,4 +1,4 @@
 VERSION_MAJOR=130
 VERSION_MINOR=0
-VERSION_PATCH=0
-VERSION_SUFFIX=-dev
+VERSION_PATCH=2
+VERSION_SUFFIX=

buildchain/buildchain/versions.py

@@ -83,7 +83,7 @@ def load_version_information() -> None:
 ETCD_VERSION: str = "3.5.16"
 ETCD_IMAGE_VERSION: str = f"{ETCD_VERSION}-0"
 NGINX_IMAGE_VERSION: str = "1.27.2-alpine"
-NODEJS_IMAGE_VERSION: str = "16.14.0"
+NODEJS_IMAGE_VERSION: str = "20.11.1"
 KEEPALIVED_VERSION: str = "2.3.1"
 CERT_MANAGER_VERSION: str = "1.16.1"