Merge pull request #730 from Nordix/fix-image-building-tests/sunnat

Passes RT credentials to image building
metal3-io · May 3, 2024 · 105466c · 105466c
2 parents cc64788 + ad7ddce
commit 105466c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/jenkins/image_building/dib_elements/centos-ci/post-install.d/99-prepull-images b/jenkins/image_building/dib_elements/centos-ci/post-install.d/99-prepull-images
diff --git a/jenkins/jobs/image_building.pipeline b/jenkins/jobs/image_building.pipeline
@@ -54,7 +54,8 @@ pipeline {
       steps {
         echo 'Building Ubuntu CI image'
         withCredentials([
-          usernamePassword(credentialsId: 'metal3ci_city_cloud_openstack_credentials', usernameVariable: 'OS_USERNAME', passwordVariable: 'OS_PASSWORD')
+          usernamePassword(credentialsId: 'metal3ci_city_cloud_openstack_credentials', usernameVariable: 'OS_USERNAME', passwordVariable: 'OS_PASSWORD'),
+          usernamePassword(credentialsId: 'infra-nordix-artifactory-api-key', usernameVariable: 'RT_USER', passwordVariable: 'RT_TOKEN')
         ]) {
           catchError([stageResult: 'FAILURE', message: "Failed to build Ubuntu CI image"]) {
             sh "./jenkins/image_building/build-image.sh"
@@ -72,7 +73,8 @@ pipeline {
       steps {
         echo 'Building Centos CI image'
         withCredentials([
-          usernamePassword(credentialsId: 'metal3ci_city_cloud_openstack_credentials', usernameVariable: 'OS_USERNAME', passwordVariable: 'OS_PASSWORD')
+          usernamePassword(credentialsId: 'metal3ci_city_cloud_openstack_credentials', usernameVariable: 'OS_USERNAME', passwordVariable: 'OS_PASSWORD'),
+          usernamePassword(credentialsId: 'infra-nordix-artifactory-api-key', usernameVariable: 'RT_USER', passwordVariable: 'RT_TOKEN')
         ]) {
           catchError([stageResult: 'FAILURE', message: "Failed to build Centos CI image"]) {
             sh "./jenkins/image_building/build-image.sh"