From: Fatih Degirmenci <fdegir@gmail.com>
Date: Tue, 23 Apr 2019 10:25:03 +0000 (+0000)
Subject: Merge "Reenable yardstick for virtual deployments"
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=745e77be18c1b55cfad46f72291c0b3a5aee0b28;hp=-c;p=infra%2Fcicd.git

Merge "Reenable yardstick for virtual deployments"
---

745e77be18c1b55cfad46f72291c0b3a5aee0b28
diff --combined jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index 708b1600f,31b5f67a7..2291089ae
--- a/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: