Move verify and periodic jobs to City Cloud instances

Change-Id: I56dc843cedf5992d78bf930455aa4dcdd9edb341

diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index e945b39cc945c5f60af05d0181cbc536828c81e0..708b1600f19898835a0f33a3b6395562c43b5b8c 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -86,7 +86,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 +140,6 @@
       - build-timeout:
           timeout: 120
       - fix-workspace-permissions
-      - openstack:
-          single-use: True
 
     scm:
       - git-scm:

diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index ff36fae1a93055af281f298954e842fa0a68bebe..57d26085b438b7febb791903ebe0cddd17bfba56 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -93,7 +93,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
@@ -147,8 +147,6 @@
       - build-timeout:
           timeout: 120
       - fix-workspace-permissions
-      - openstack:
-          single-use: True
 
     scm:
       - git-scm-gerrit: