cloud-infra: Use prebuilt deployment image

[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 41dc3c40688184492b8e7266b60b649ef8471c85..f943ced2301e8f1ea71006afc82706fca8f5dcd4 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
@@ -81,6 +81,10 @@
           name: DISTRIBUTION
           default: '{distribution}'
           description: 'Distribution to use for configuring target nodes (networking etc.)'
+      - string:
+          name: USE_PREBUILT_DEPLOYMENT_IMAGE
+          default: 'true'
+          description: 'Use prebuilt deployment image while running as part of CI/CD'
       - string:
           name: IPA_DIB_OS_ELEMENT
           default: '{ipa_dib_os_element}'
@@ -140,6 +144,7 @@
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
+                USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
                 IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
                 DIB_OS_RELEASE=$DIB_OS_RELEASE
                 DIB_OS_ELEMENT=$DIB_OS_ELEMENT
@@ -160,6 +165,7 @@
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
+                USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
                 IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
                 DIB_OS_RELEASE=$DIB_OS_RELEASE
                 DIB_OS_ELEMENT=$DIB_OS_ELEMENT
@@ -191,6 +197,10 @@
           name: DISTRIBUTION
           default: 'ubuntu18'
           description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
+      - string:
+          name: USE_PREBUILT_DEPLOYMENT_IMAGE
+          default: 'false'
+          description: 'Use prebuilt deployment image while running as part of CI/CD'
       - string:
           name: IPA_DIB_OS_ELEMENT
           default: 'fedora'
@@ -228,12 +238,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