Merge pull request #1099 from Nordix/peppi-lotta/add-CNI_NAME-env-variable

metal3-io-bot · web-flow · commit 64705fe195b2 · 2025-09-18T09:18:43.000+03:00
🌱 Add CNI_NAME env variable to allow switching CNI in test
diff --git a/jenkins/jobs/capm3-e2e-tests.pipeline b/jenkins/jobs/capm3-e2e-tests.pipeline
@@ -71,6 +71,7 @@ pipeline {
         EPHEMERAL_TEST = "${EPHEMERAL_TEST}"
         KUBERNETES_VERSION_UPGRADE_FROM = "${KUBERNETES_VERSION_UPGRADE_FROM}"
         KUBERNETES_VERSION_UPGRADE_TO = "${KUBERNETES_VERSION_UPGRADE_TO}"
+        CNI_NAME = "${CNI_NAME}"
     }
 
     stages {
diff --git a/jenkins/jobs/dev_env_integration_tests.pipeline b/jenkins/jobs/dev_env_integration_tests.pipeline
@@ -41,6 +41,7 @@ pipeline {
     IRONIC_USE_MARIADB = "${params.IRONIC_USE_MARIADB}"
     BUILD_MARIADB_IMAGE_LOCALLY = "${params.BUILD_MARIADB_IMAGE_LOCALLY}"
     USE_IRSO = "${params.USE_IRSO}"
+    CNI_NAME = "${params.CNI_NAME}"
   }
 
   stages {

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ pipeline {`
`71`	`71`	`EPHEMERAL_TEST = "${EPHEMERAL_TEST}"`
`72`	`72`	`KUBERNETES_VERSION_UPGRADE_FROM = "${KUBERNETES_VERSION_UPGRADE_FROM}"`
`73`	`73`	`KUBERNETES_VERSION_UPGRADE_TO = "${KUBERNETES_VERSION_UPGRADE_TO}"`
	`74`	`+ CNI_NAME = "${CNI_NAME}"`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`stages {`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ pipeline {`
`41`	`41`	`IRONIC_USE_MARIADB = "${params.IRONIC_USE_MARIADB}"`
`42`	`42`	`BUILD_MARIADB_IMAGE_LOCALLY = "${params.BUILD_MARIADB_IMAGE_LOCALLY}"`
`43`	`43`	`USE_IRSO = "${params.USE_IRSO}"`
	`44`	`+ CNI_NAME = "${params.CNI_NAME}"`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`stages {`