Merge "Reenable yardstick for virtual deployments"

diff --combined jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index 708b1600f19898835a0f33a3b6395562c43b5b8c,31b5f67a713105ba51a716717a01eb942dbfd4b9..2291089ae414cd27f46f3536242d68dc05ac766f
--- 1/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
--- 2/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@@ -65,6 -65,7 +65,7 @@@
      phase:
        - deploy
        - functest
+       - yardstick
  
      jobs:
        - 'cloud-infra-periodic-engine-{os}-{type}-{stream}'
@@@ -86,7 -87,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,6 -141,8 +141,6 @@@
        - build-timeout:
            timeout: 120
        - fix-workspace-permissions
 -      - openstack:
 -          single-use: True
  
      scm:
        - git-scm: