Merge "Add defaults for ghprbAuthorRepoGitUrl & ghprbActualCommit."

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-verify-engine.yaml

diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index 837af99aac90995fe9e145d644f5d069f540ca9c..21c46550880e526aa7c4496b858e7b50b30e1d93 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -66,20 +66,21 @@
           notbuilt: true
     cloud:
       - city:
-          slave-label: 'city-jumphost-onap-ubuntu1804'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap'
 
     type:
       - virtual:
           provisioner-type: 'bifrost'
+          slave-type: 'vpod'
       - cloud:
           provisioner-type: 'heat'
+          slave-type: 'jumphost'
 
     phase:
       - deploy:
           build-timeout: 90
       - functest:
-          build-timeout: 30
+          build-timeout: 60
 
     jobs:
       - 'cloud-infra-verify-engine-{distro}-{cloud}-{type}-{stream}'
@@ -101,7 +102,7 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: '{slave-label}'
+          default: '{cloud}-{slave-type}-{distro}'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
           name: DISTRO