X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-verify-jobs.yaml;h=bbb5baec53da86f7ccdf387e8facf41288dc22bd;hb=9c50e0912a48aedf3470fb069c29d7193d610be4;hp=901ceb6b0e77450fd59041425dff6b5cff605023;hpb=885498a2b0ee7f058e23eb0533b096af7ec8d785;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 901ceb6b..bbb5baec 100644
--- a/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
@@ -28,8 +28,25 @@
           branch: '{stream}'
           disabled: 'false'
 
-    distro:
-      - ubuntu1604
+    os:
+      - ubuntu1604:
+          disabled: 'true'
+          distribution: 'ubuntu16'
+          ipa_dib_os_element: 'fedora'
+          dib_os_release: 'xenial'
+          dib_os_element: 'ubuntu-minimal'
+      - ubuntu1804:
+          disabled: 'false'
+          distribution: 'ubuntu18'
+          ipa_dib_os_element: 'fedora'
+          dib_os_release: 'bionic'
+          dib_os_element: 'ubuntu-minimal'
+      - centos7:
+          disabled: 'true'
+          distribution: 'centos7'
+          ipa_dib_os_element: 'fedora'
+          dib_os_release: '7'
+          dib_os_element: 'centos-minimal'
 
     type:
       - virtual
@@ -39,11 +56,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
 
@@ -56,19 +73,37 @@
           project: '{project}'
           branch: '{branch}'
       - nordix-gerrit-parameters
+      - label:
+          name: SLAVE_LABEL
+          default: 'vpod-deploy-{os}'
+          description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
+      - string:
+          name: DISTRIBUTION
+          default: '{distribution}'
+          description: 'Distribution to use for configuring target nodes (networking etc.)'
+      - string:
+          name: IPA_DIB_OS_ELEMENT
+          default: '{ipa_dib_os_element}'
+          description: 'DIB OS Element to use for building the ramdisk image'
+      - string:
+          name: DIB_OS_RELEASE
+          default: '{dib_os_release}'
+          description: 'DIB OS Release to use for building the deployment image to provision target nodes with'
       - string:
-          name: DISTRO
-          default: '{distro}'
+          name: DIB_OS_ELEMENT
+          default: '{dib_os_element}'
+          description: 'DIB OS Element to use for building the deployment image to provision target nodes with'
       - string:
           name: CLEANUP
           default: 'true'
+          description: 'Cleanup leftovers of the previous run'
 
     properties:
       - logrotate
       - 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'
@@ -82,10 +117,6 @@
           timeout: 120
       - fix-workspace-permissions
       - openstack:
-          instances:
-            - cloud-name: Xerces_EST_ONAP
-              template-name: cloud-infra-vpod
-              count: 1
           single-use: True
 
     scm:
@@ -105,10 +136,13 @@
           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
+                IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
+                DIB_OS_RELEASE=$DIB_OS_RELEASE
+                DIB_OS_ELEMENT=$DIB_OS_ELEMENT
                 CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -122,10 +156,13 @@
           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
+                IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
+                DIB_OS_RELEASE=$DIB_OS_RELEASE
+                DIB_OS_ELEMENT=$DIB_OS_ELEMENT
                 CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -137,7 +174,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
 
@@ -151,8 +188,21 @@
           name: PROJECT
           default: $GERRIT_PROJECT
       - string:
-          name: DISTRO
-          default: 'ubuntu1604'
+          name: DISTRIBUTION
+          default: 'ubuntu18'
+          description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
+      - string:
+          name: IPA_DIB_OS_ELEMENT
+          default: 'fedora'
+          description: 'DIB OS Element to use for building the ramdisk image. Overriden by upstream job.'
+      - string:
+          name: DIB_OS_RELEASE
+          default: 'bionic'
+          description: 'DIB OS Release to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
+      - string:
+          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: CLEANUP
           default: 'false'
@@ -178,6 +228,8 @@
 - builder:
     name: 'cloud-infra-verify-deploy-macro'
     builders:
+      - shell:
+          !include-raw: ./wait-for-pkg-manager.sh
       - shell:
           !include-raw: ./cloud-infra-deploy.sh