X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-verify-engine.yaml;h=34bd879aac1e950f52f8a91f0ef6b44b607460d5;hb=e921738689626876f05977326bb267e139617b22;hp=e9a1aa417bc84394647bf57f76bfb40d61d48931;hpb=f6d92e9bc27e865592a14b06a269d6f14ea21bbf;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index e9a1aa41..34bd879a 100644
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -53,12 +53,14 @@
 
     distro:
       - ubuntu1804:
+          slave-label: vpod-deploy-ubuntu1804
           disabled: false
           successful: false
           failed: false
           unstable: false
           notbuilt: false
       - centos7:
+          slave-label: vpod-deploy-centos7
           disabled: true
           successful: true
           failed: true
@@ -69,8 +71,10 @@
       - virtual
 
     phase:
-      - deploy
-      - functest
+      - deploy:
+          build-timeout: 90
+      - functest:
+          build-timeout: 30
 
     jobs:
       - 'cloud-infra-verify-engine-{distro}-{type}-{stream}'
@@ -92,7 +96,7 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'vpod-deploy-city'
+          default: '{slave-label}'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
           name: DISTRO
@@ -128,6 +132,7 @@
             - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
             - 'k8-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -135,9 +140,16 @@
           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
+      - openstack:
+          single-use: True
 
     scm:
       - git-scm-gerrit:
@@ -177,6 +189,9 @@
           custom-url: '* $JOB_NAME $BUILD_URL'
 
     builders:
+      - shell: |
+          #!/bin/bash
+          cp $OPENRC_FILE /tmp/openrc
       - 'cloud-infra-determine-scenario-macro'
       - multijob:
           name: deploy
@@ -266,8 +281,13 @@
           default: 'false'
 
     wrappers:
+      - credentials-binding:
+          - file:
+              credential-id: est-jenkins-openrcfile-city-karlskrona-onap
+              variable: OPENRC_FILE
+      - mask-passwords
       - build-timeout:
-          timeout: 120
+          timeout: '{build-timeout}'
       - fix-workspace-permissions
 
     scm: