Merge "Reenable yardstick for virtual deployments"

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

diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index e945b39cc945c5f60af05d0181cbc536828c81e0..2291089ae414cd27f46f3536242d68dc05ac766f 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -65,6 +65,7 @@
     phase:
       - deploy
       - functest
+      - yardstick
 
     jobs:
       - 'cloud-infra-periodic-engine-{os}-{type}-{stream}'
@@ -86,7 +87,7 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'vpod-deploy-{os}'
+          default: 'vpod-deploy-city'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
           name: DISTRIBUTION
@@ -140,8 +141,6 @@
       - build-timeout:
           timeout: 120
       - fix-workspace-permissions
-      - openstack:
-          single-use: True
 
     scm:
       - git-scm: