X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-verify-jobs.yaml;h=65c6ea0a7ceb7aea7529381da40b9bb94f4d70b0;hb=a71174ca4e8199789b48b84167277db2353ac66f;hp=a2e2050d665c5670f4662120e4045f9d6f5ddb91;hpb=6b4d285002773c82ecab1b6485a51c6af80d0820;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-verify-jobs.yaml b/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
index a2e2050d..65c6ea0a 100644
--- a/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
@@ -21,15 +21,23 @@
 - project:
     name: 'cloud-infra-verify'
 
-    project: 'cloud-infra'
+    project: 'infra/engine'
 
     stream:
       - 'master':
           branch: '{stream}'
           disabled: 'false'
 
-    distro:
-      - ubuntu1604
+    os:
+      - ubuntu1604:
+          distribution: ubuntu16
+          disabled: 'false'
+      - ubuntu1804:
+          distribution: ubuntu18
+          disabled: 'true'
+      - centos7:
+          distribution: centos7
+          disabled: 'true'
 
     type:
       - virtual
@@ -39,11 +47,11 @@
       - test
 
     jobs:
-      - 'cloud-infra-verify-{distro}-{type}-{stream}'
-      - 'cloud-infra-verify-{distro}-{phase}-{type}-{stream}'
+      - 'cloud-infra-verify-{os}-{type}-{stream}'
+      - 'cloud-infra-verify-{os}-{phase}-{type}-{stream}'
 
 - job-template:
-    name: 'cloud-infra-verify-{distro}-{type}-{stream}'
+    name: 'cloud-infra-verify-{os}-{type}-{stream}'
 
     project-type: multijob
 
@@ -58,31 +66,34 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'cloud-infra-vpod'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
+          default: 'vpod-deploy-{os}'
       - string:
           name: DISTRO
-          default: '{distro}'
+          default: '{os}'
+      - string:
+          name: CLEANUP
+          default: 'true'
 
     properties:
       - logrotate
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-verify-{distro}-.*'
+            - 'cloud-infra-verify-{os}-.*'
             - '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:
+          single-use: True
 
     scm:
       - git-scm-gerrit:
@@ -92,7 +103,7 @@
 
     triggers:
       - nordix-gerrit-trigger-patchset-created:
-          project: 'infra/engine|infra/swconfig'
+          project: 'infra\/engine|infra\/swconfig'
           branch: '{branch}'
           files: '**'
 
@@ -101,10 +112,11 @@
           name: deploy
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-{distro}-deploy-{type}-{stream}'
+            - name: 'cloud-infra-verify-{os}-deploy-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRO={distro}
+                DISTRIBUTION={distribution}
+                CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -117,10 +129,11 @@
           name: test
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-{distro}-test-{type}-{stream}'
+            - name: 'cloud-infra-verify-{os}-test-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRO={distro}
+                DISTRIBUTION={distribution}
+                CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -131,7 +144,7 @@
               abort-all-job: true
 
 - job-template:
-    name: 'cloud-infra-verify-{distro}-{phase}-{type}-{stream}'
+    name: 'cloud-infra-verify-{os}-{phase}-{type}-{stream}'
 
     disabled: false
 
@@ -147,6 +160,9 @@
       - string:
           name: DISTRO
           default: 'ubuntu1604'
+      - string:
+          name: CLEANUP
+          default: 'false'
 
     wrappers:
       - build-timeout:
@@ -169,6 +185,12 @@
 - builder:
     name: 'cloud-infra-verify-deploy-macro'
     builders:
+      - shell: |
+          #!/bin/bash
+
+          # it takes some time before the OpenStack slave becomes fully operational
+          # so we give it some more time before doing anything
+          sleep 30
       - shell:
           !include-raw: ./cloud-infra-deploy.sh