Merge pull request #2729 from Nordix/lentzi90/e2e-upgrade-irso

🌱 E2E: Use IrSO also in upgrade tests

Author: metal3-io-bot

Makefile

@@ -52,7 +52,7 @@ GINKGO_FOCUS ?=
 GINKGO_SKIP ?=
 GINKGO_SKIP_LABELS ?=
 GINKGO_NODES ?= 2
-GINKGO_TIMEOUT ?= 2h
+GINKGO_TIMEOUT ?= 3h
 GINKGO_POLL_PROGRESS_AFTER ?= 60m
 GINKGO_POLL_PROGRESS_INTERVAL ?= 5m
 E2E_CONF_FILE ?= $(ROOT_DIR)/test/e2e/config/fixture.yaml

config/overlays/e2e-release-0.10/ironic.env

@@ -1,3 +1,3 @@
 DEPLOY_KERNEL_URL=http://192.168.222.1:6180/images/ironic-python-agent.kernel
 DEPLOY_RAMDISK_URL=http://192.168.222.1:6180/images/ironic-python-agent.initramfs
-IRONIC_ENDPOINT=https://192.168.222.1:6385/v1/
+IRONIC_ENDPOINT=https://192.168.222.2:6385/v1/

config/overlays/e2e-release-0.11/ironic.env

@@ -1,3 +1,3 @@
 DEPLOY_KERNEL_URL=http://192.168.222.1:6180/images/ironic-python-agent.kernel
 DEPLOY_RAMDISK_URL=http://192.168.222.1:6180/images/ironic-python-agent.initramfs
-IRONIC_ENDPOINT=https://192.168.222.1:6385/v1/
+IRONIC_ENDPOINT=https://192.168.222.2:6385/v1/

config/overlays/e2e-release-0.9/ironic.env

@@ -1,3 +1,3 @@
 DEPLOY_KERNEL_URL=http://192.168.222.1:6180/images/ironic-python-agent.kernel
 DEPLOY_RAMDISK_URL=http://192.168.222.1:6180/images/ironic-python-agent.initramfs
-IRONIC_ENDPOINT=https://192.168.222.1:6385/v1/
+IRONIC_ENDPOINT=https://192.168.222.2:6385/v1/

hack/ci-e2e.sh

@@ -193,15 +193,6 @@ BMO_OVERLAYS=(
   "${REPO_ROOT}/config/overlays/e2e-release-0.10"
   "${REPO_ROOT}/config/overlays/e2e-release-0.11"
 )
-IRONIC_OVERLAYS=(
-  "${REPO_ROOT}/ironic-deployment/overlays/e2e"
-  "${REPO_ROOT}/ironic-deployment/overlays/e2e-release-26.0"
-  "${REPO_ROOT}/ironic-deployment/overlays/e2e-release-27.0"
-  "${REPO_ROOT}/ironic-deployment/overlays/e2e-release-28.0"
-  "${REPO_ROOT}/ironic-deployment/overlays/e2e-release-29.0"
-  "${REPO_ROOT}/ironic-deployment/overlays/e2e-release-30.0"
-  "${REPO_ROOT}/ironic-deployment/overlays/e2e-release-31.0"
-)
 
 IRONIC_USERNAME="$(uuidgen)"
 IRONIC_PASSWORD="$(uuidgen)"
@@ -215,13 +206,6 @@ for overlay in "${BMO_OVERLAYS[@]}"; do
   echo "${IRONIC_PASSWORD}" > "${overlay}/ironic-password"
 done
 
-for overlay in "${IRONIC_OVERLAYS[@]}"; do
-  echo "IRONIC_HTPASSWD=$(htpasswd -n -b -B "${IRONIC_USERNAME}" "${IRONIC_PASSWORD}")" > \
-    "${overlay}/ironic-htpasswd"
-  envsubst < "${REPO_ROOT}/ironic-deployment/components/basic-auth/ironic-auth-config-tpl" > \
-  "${overlay}/ironic-auth-config"
-done
-
 IRSO_IRONIC_AUTH_DIR="${REPO_ROOT}/test/e2e/data/ironic-standalone-operator/components/basic-auth"
 echo "${IRONIC_USERNAME}" > "${IRSO_IRONIC_AUTH_DIR}/ironic-username"
 echo "${IRONIC_PASSWORD}" > "${IRSO_IRONIC_AUTH_DIR}/ironic-password"