Adjust jobs based on supported distros

[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 100371047fa67a05f28529c9e099e5c65e95e8f3..65c6ea0a7ceb7aea7529381da40b9bb94f4d70b0 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
@@ -28,8 +28,16 @@
           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,10 +66,10 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'cloud-infra-vpod'
+          default: 'vpod-deploy-{os}'
       - string:
           name: DISTRO
-          default: '{distro}'
+          default: '{os}'
       - string:
           name: CLEANUP
           default: 'true'
@@ -71,7 +79,7 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-verify-{distro}-.*'
+            - 'cloud-infra-verify-{os}-.*'
             - 'cloud-infra-os-.*'
             - 'cloud-infra-k8-.*'
           block-level: 'NODE'
@@ -104,10 +112,10 @@
           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
@@ -121,10 +129,10 @@
           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
@@ -136,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