From: Fatih Degirmenci <fdegir@gmail.com>
Date: Thu, 18 Apr 2019 12:44:57 +0000 (+0200)
Subject: Move verify and periodic jobs to City Cloud instances
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=046efef572b2e6182c2cf59071ce92fd5a5569c2;p=infra%2Fcicd.git

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 e945b39cc..708b1600f 100644
--- 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 ff36fae1a..57d26085b 100644
--- 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: