From 45e6642f24e32f010e23a9c6813c687b0b08aa0f Mon Sep 17 00:00:00 2001
From: Huy Mai <huy.mai@est.tech>
Date: Tue, 14 Jan 2025 11:25:46 +0200
Subject: [PATCH] Add support for IRSO in e2e pipeline

This adds IRSO param for E2E pipeline

Signed-off-by: Huy Mai <huy.mai@est.tech>
---
 .../jobs/dev_env_integration_tests.pipeline   | 21 ++++++++++---------
 .../dev_env_integration_tests.sh              |  1 +
 .../metal3-io/ironic-standalone-operator.yaml | 13 ++++++++++++
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/jenkins/jobs/dev_env_integration_tests.pipeline b/jenkins/jobs/dev_env_integration_tests.pipeline
index 7f524363..a177ab08 100644
--- a/jenkins/jobs/dev_env_integration_tests.pipeline
+++ b/jenkins/jobs/dev_env_integration_tests.pipeline
@@ -32,16 +32,17 @@ pipeline {
     UPDATED_BRANCH = "${env.PULL_PULL_SHA}"
     BUILD_TAG = "${env.BUILD_TAG}"
     PR_ID = "${env.PULL_NUMBER}"
-    IMAGE_OS = "${IMAGE_OS}"
-    CAPI_VERSION = "${CAPI_VERSION}"
-    CAPM3_VERSION = "${CAPM3_VERSION}"
-    CAPM3RELEASEBRANCH = "${capm3_release_branch}"
-    BMORELEASEBRANCH = "${bmo_release_branch}"
-    TARGET_NODE_MEMORY = "${TARGET_NODE_MEMORY}"
-    NUM_NODES=2
-    IRONIC_INSTALL_TYPE="${params.IRONIC_INSTALL_TYPE}"
-    IRONIC_USE_MARIADB="${params.IRONIC_USE_MARIADB}"
-    BUILD_MARIADB_IMAGE_LOCALLY="${params.BUILD_MARIADB_IMAGE_LOCALLY}"
+    IMAGE_OS = "${params.IMAGE_OS}"
+    CAPI_VERSION = "${params.CAPI_VERSION}"
+    CAPM3_VERSION = "${params.CAPM3_VERSION}"
+    CAPM3RELEASEBRANCH = "${params.capm3_release_branch}"
+    BMORELEASEBRANCH = "${params.bmo_release_branch}"
+    TARGET_NODE_MEMORY = "${params.TARGET_NODE_MEMORY}"
+    NUM_NODES = 2
+    IRONIC_INSTALL_TYPE = "${params.IRONIC_INSTALL_TYPE}"
+    IRONIC_USE_MARIADB = "${params.IRONIC_USE_MARIADB}"
+    BUILD_MARIADB_IMAGE_LOCALLY = "${params.BUILD_MARIADB_IMAGE_LOCALLY}"
+    USE_IRSO = "${params.USE_IRSO}"
   }
 
   stages {
diff --git a/jenkins/scripts/dynamic_worker_workflow/dev_env_integration_tests.sh b/jenkins/scripts/dynamic_worker_workflow/dev_env_integration_tests.sh
index e156b87c..80afacc6 100755
--- a/jenkins/scripts/dynamic_worker_workflow/dev_env_integration_tests.sh
+++ b/jenkins/scripts/dynamic_worker_workflow/dev_env_integration_tests.sh
@@ -24,6 +24,7 @@ export TARGET_NODE_MEMORY="${TARGET_NODE_MEMORY:-4096}"
 export IRONIC_INSTALL_TYPE="${IRONIC_INSTALL_TYPE:-rpm}"
 export IRONIC_FROM_SOURCE="${IRONIC_FROM_SOURCE:-false}"
 export BUILD_IRONIC_IMAGE_LOCALLY=""
+export USE_IRSO="${USE_IRSO:-false}"
 
 if [[ "${IRONIC_INSTALL_TYPE}" == "source" ]]; then
     IRONIC_FROM_SOURCE="true"
diff --git a/prow/config/jobs/metal3-io/ironic-standalone-operator.yaml b/prow/config/jobs/metal3-io/ironic-standalone-operator.yaml
index 3758ad2f..ffa6bbe6 100644
--- a/prow/config/jobs/metal3-io/ironic-standalone-operator.yaml
+++ b/prow/config/jobs/metal3-io/ironic-standalone-operator.yaml
@@ -48,3 +48,16 @@ presubmits:
           value: "/"
         image: ghcr.io/yannh/kubeconform:v0.6.7-alpine@sha256:824e0c248809e4b2da2a768b16b107cf17ada88a89ec6aa6050e566ba93ebbc6
         imagePullPolicy: Always
+  # name: metal3-dev-env-integration-test-{image_os}-main
+  - name: metal3-dev-env-integration-test-ubuntu-main
+    branches:
+    - main
+    agent: jenkins
+    always_run: false
+    optional: true
+  - name: metal3-dev-env-integration-test-centos-main
+    branches:
+    - main
+    agent: jenkins
+    always_run: false
+    optional: true