Enable engine patch verification on openstack for k8s

Change-Id: If20ddbe1375c167fa7e1de954d80e5c3cde3252c

diff --git a/jjb/cloud-infra/cloud-infra-deploy.sh b/jjb/cloud-infra/cloud-infra-deploy.sh
index ae8c79842669c6204aa316621fbec173689bf1b5..1812f2fcbba97ece6c7df0153a517e48b75c3379 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-deploy.sh
+++ b/jjb/cloud-infra/cloud-infra-deploy.sh
@@ -45,8 +45,17 @@ else
   IDF="https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-idf.yml"
 fi
 
+if [[ $PROVISIONER_TYPE == "bifrost" ]]; then
+  DEPLOY_CMD="./engine/deploy.sh -c -r $PROVISIONER_TYPE -d $INSTALLER_TYPE -o $DISTRO -s $DEPLOY_SCENARIO -p $PDF -i $IDF"
+elif [[ $PROVISIONER_TYPE == "heat" ]]; then
+  DEPLOY_CMD="./engine/deploy.sh -c -r $PROVISIONER_TYPE -d $INSTALLER_TYPE -o $DISTRO -s $DEPLOY_SCENARIO -u /tmp/openrc"
+else
+  echo "Error: Unsupported provisioner type. Must either be bifrost or heat!"
+  exit 1
+fi
+
 # execute cloud engine deploy.sh script
 cd $WORKSPACE
-./engine/deploy.sh -d $INSTALLER_TYPE -o $DISTRO -s $DEPLOY_SCENARIO -p $PDF -i $IDF -c
+$DEPLOY_CMD
 
 # vim: set ts=2 sw=2 expandtab:

diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index 12e14a20663f1cd8754ef4e8810e345974b69fb8..b8b549cb8597cb49cec15d40e3cb7a90d0fed5e9 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -139,6 +139,11 @@
           option: project
 
     wrappers:
+      - credentials-binding:
+          - file:
+              credential-id: est-jenkins-openrcfile-city-karlskrona-onap
+              variable: OPENRC_FILE
+      - mask-passwords
       - build-timeout:
           timeout: 120
       - fix-workspace-permissions
@@ -183,6 +188,9 @@
           custom-url: '* $JOB_NAME $BUILD_URL'
 
     builders:
+      - shell: |
+          #!/bin/bash
+          cp $OPENRC_FILE /tmp/openrc
       - 'cloud-infra-determine-scenario-macro'
       - multijob:
           name: deploy
@@ -272,6 +280,11 @@
           default: 'false'
 
     wrappers:
+      - credentials-binding:
+          - file:
+              credential-id: est-jenkins-openrcfile-city-karlskrona-onap
+              variable: OPENRC_FILE
+      - mask-passwords
       - build-timeout:
           timeout: '{build-timeout}'
       - fix-workspace-permissions