cloud-infra-jjb: Adjust configuration to make it work

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-verify-jobs.yaml

diff --git a/jjb/cloud-infra/cloud-infra-verify-jobs.yaml b/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
index a2e2050d665c5670f4662120e4045f9d6f5ddb91..901ceb6b0e77450fd59041425dff6b5cff605023 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
@@ -21,7 +21,7 @@
 - project:
     name: 'cloud-infra-verify'
 
-    project: 'cloud-infra'
+    project: 'infra/engine'
 
     stream:
       - 'master':
@@ -56,14 +56,12 @@
           project: '{project}'
           branch: '{branch}'
       - nordix-gerrit-parameters
-      - label:
-          name: SLAVE_LABEL
-          default: 'cloud-infra-vpod'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
       - string:
           name: DISTRO
           default: '{distro}'
+      - string:
+          name: CLEANUP
+          default: 'true'
 
     properties:
       - logrotate
@@ -73,16 +71,22 @@
             - 'cloud-infra-verify-{distro}-.*'
             - 'cloud-infra-os-.*'
             - 'cloud-infra-k8-.*'
-          blocking-level: 'NODE'
+          block-level: 'NODE'
       - throttle:
           max-per-node: 1
-          max-total: 2
+          max-total: 3
           option: project
 
     wrappers:
       - build-timeout:
           timeout: 120
       - fix-workspace-permissions
+      - openstack:
+          instances:
+            - cloud-name: Xerces_EST_ONAP
+              template-name: cloud-infra-vpod
+              count: 1
+          single-use: True
 
     scm:
       - git-scm-gerrit:
@@ -92,7 +96,7 @@
 
     triggers:
       - nordix-gerrit-trigger-patchset-created:
-          project: 'infra/engine|infra/swconfig'
+          project: 'infra\/engine|infra\/swconfig'
           branch: '{branch}'
           files: '**'
 
@@ -105,6 +109,7 @@
               current-parameters: true
               predefined-parameters: |
                 DISTRO={distro}
+                CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -121,6 +126,7 @@
               current-parameters: true
               predefined-parameters: |
                 DISTRO={distro}
+                CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -147,6 +153,9 @@
       - string:
           name: DISTRO
           default: 'ubuntu1604'
+      - string:
+          name: CLEANUP
+          default: 'false'
 
     wrappers:
       - build-timeout: