Move verify and periodic jobs to City Cloud instances

[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 9565febda867c02b6bb7519a45a29fff52768309..708b1600f19898835a0f33a3b6395562c43b5b8c 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -65,7 +65,6 @@
     phase:
       - deploy
       - functest
-      - yardstick
 
     jobs:
       - 'cloud-infra-periodic-engine-{os}-{type}-{stream}'
@@ -87,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
@@ -141,8 +140,6 @@
       - build-timeout:
           timeout: 120
       - fix-workspace-permissions
-      - openstack:
-          single-use: True
 
     scm:
       - git-scm:
@@ -235,6 +232,10 @@
           name: DIB_OS_ELEMENT
           default: 'ubuntu-minimal'
           description: 'DIB OS Element to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
+      - string:
+          name: ENGINE_ANSIBLE_PARAMS
+          default: ' -v '
+          description: 'Extra paramters that can be added when run the play books.'
       - string:
           name: DEPLOY_SCENARIO
           default: 'k8-calico-nofeature'
@@ -267,26 +268,6 @@
           refspec: ''
 
     builders:
-      - 'cloud-infra-periodic-test-macro'
-
-# -------------------------------
-# builder macros
-# -------------------------------
-
-- builder:
-    name: 'cloud-infra-periodic-deploy-macro'
-    builders:
-      - shell:
-          !include-raw: ./wait-for-pkg-manager.sh
-      - shell:
-          !include-raw: ./cloud-infra-deploy.sh
-
-- builder:
-    name: 'cloud-infra-periodic-test-macro'
-    builders:
-      - shell:
-          !include-raw: ./prepare-for-test.sh
-      - shell:
-          !include-raw: ./cloud-infra-test.sh
+      - 'cloud-infra-{phase}-macro'
 
 # vim: set ts=2 sw=2 expandtab: