Enable scenario input for engine verify jobs

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-verify-engine.yaml

diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index 932d478d96405575ba773df949af3d51d288c531..25e55dd324be0fe45e9ec6756e397cdd828deab9 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -75,7 +75,7 @@
 
     jobs:
       - 'cloud-infra-verify-engine-{os}-{type}-{stream}'
-      - 'cloud-infra-verify-{os}-{phase}-{type}-{stream}'
+      - 'cloud-infra-verify-engine-{os}-{phase}-{type}-{stream}'
 
 - job-template:
     name: 'cloud-infra-verify-engine-{os}-{type}-{stream}'
@@ -93,12 +93,16 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'vpod-deploy-{os}'
+          default: 'vpod-deploy-city'
           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: DEPLOY_TYPE
+          default: '{type}'
+          description: 'Type of the deployment'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'true'
@@ -115,10 +119,6 @@
           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: DEPLOY_SCENARIO
-          default: 'k8-calico-nofeature'
-          description: 'Scenario to deploy and test'
       - string:
           name: TEST_SUITE
           default: 'healthcheck'
@@ -134,6 +134,7 @@
           use-build-blocker: true
           blocking-jobs:
             - 'cloud-infra-verify-engine-{os}-.*'
+            - 'cloud-infra-verify-scenario-{os}-.*'
             - 'cloud-infra-periodic-engine-{os}-.*'
             - 'cloud-infra-os-.*'
             - 'cloud-infra-k8-.*'
@@ -147,8 +148,6 @@
       - build-timeout:
           timeout: 120
       - fix-workspace-permissions
-      - openstack:
-          single-use: True
 
     scm:
       - git-scm-gerrit:
@@ -163,14 +162,16 @@
           files: '**'
 
     builders:
+      - 'cloud-infra-determine-scenario-macro'
       - multijob:
           name: deploy
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-{os}-deploy-{type}-{stream}'
+            - name: 'cloud-infra-verify-engine-{os}-deploy-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
+                DEPLOY_TYPE=$DEPLOY_TYPE
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
                 IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
                 DIB_OS_RELEASE=$DIB_OS_RELEASE
@@ -188,15 +189,15 @@
           name: functest
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-{os}-functest-{type}-{stream}'
+            - name: 'cloud-infra-verify-engine-{os}-functest-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
+                DEPLOY_TYPE=$DEPLOY_TYPE
                 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
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
                 CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
@@ -209,7 +210,7 @@
               abort-all-job: true
 
 - job-template:
-    name: 'cloud-infra-verify-{os}-{phase}-{type}-{stream}'
+    name: 'cloud-infra-verify-engine-{os}-{phase}-{type}-{stream}'
 
     disabled: false
 
@@ -226,6 +227,10 @@
           name: DISTRIBUTION
           default: 'ubuntu18'
           description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
+      - string:
+          name: DEPLOY_TYPE
+          default: 'virtual'
+          description: 'Type of the deployment. Overriden by upstream job.'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'false'
@@ -242,10 +247,6 @@
           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: DEPLOY_SCENARIO
-          default: 'k8-calico-nofeature'
-          description: 'Scenario to deploy and test'
       - string:
           name: TEST_FW
           default: '{phase}'
@@ -274,26 +275,7 @@
           refspec: $GERRIT_REFSPEC
 
     builders:
-      - 'cloud-infra-verify-{phase}-macro'
-
-# -------------------------------
-# builder macros
-# -------------------------------
-
-- builder:
-    name: 'cloud-infra-verify-deploy-macro'
-    builders:
-      - shell:
-          !include-raw: ./wait-for-pkg-manager.sh
-      - shell:
-          !include-raw: ./cloud-infra-deploy.sh
-
-- builder:
-    name: 'cloud-infra-verify-functest-macro'
-    builders:
-      - shell:
-          !include-raw: ./prepare-for-test.sh
-      - shell:
-          !include-raw: ./cloud-infra-test.sh
+      - 'cloud-infra-determine-scenario-macro'
+      - 'cloud-infra-{phase}-macro'
 
 # vim: set ts=2 sw=2 expandtab: