X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-verify-jobs.yaml;h=bbb5baec53da86f7ccdf387e8facf41288dc22bd;hb=refs%2Fchanges%2F50%2F650%2F1;hp=65c6ea0a7ceb7aea7529381da40b9bb94f4d70b0;hpb=a71174ca4e8199789b48b84167277db2353ac66f;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 65c6ea0a..bbb5baec 100644
--- a/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
@@ -30,14 +30,23 @@
 
     os:
       - ubuntu1604:
-          distribution: ubuntu16
-          disabled: 'false'
-      - ubuntu1804:
-          distribution: ubuntu18
           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:
-          distribution: centos7
           disabled: 'true'
+          distribution: 'centos7'
+          ipa_dib_os_element: 'fedora'
+          dib_os_release: '7'
+          dib_os_element: 'centos-minimal'
 
     type:
       - virtual
@@ -67,12 +76,27 @@
       - 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: DISTRO
-          default: '{os}'
+          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: 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
@@ -115,7 +139,10 @@
             - name: 'cloud-infra-verify-{os}-deploy-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION={distribution}
+                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
@@ -132,7 +159,10 @@
             - name: 'cloud-infra-verify-{os}-test-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION={distribution}
+                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
@@ -158,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'
@@ -185,12 +228,8 @@
 - 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: ./wait-for-pkg-manager.sh
       - shell:
           !include-raw: ./cloud-infra-deploy.sh