X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-verify-engine.yaml;h=21c46550880e526aa7c4496b858e7b50b30e1d93;hb=47f64a780d05ee8df09662435c562d9bc4362da2;hp=34bd879aac1e950f52f8a91f0ef6b44b607460d5;hpb=e921738689626876f05977326bb267e139617b22;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index 34bd879a..21c46550 100644
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -53,35 +53,41 @@
 
     distro:
       - ubuntu1804:
-          slave-label: vpod-deploy-ubuntu1804
           disabled: false
           successful: false
           failed: false
           unstable: false
           notbuilt: false
       - centos7:
-          slave-label: vpod-deploy-centos7
           disabled: true
           successful: true
           failed: true
           unstable: true
           notbuilt: true
+    cloud:
+      - city:
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap'
 
     type:
-      - virtual
+      - virtual:
+          provisioner-type: 'bifrost'
+          slave-type: 'vpod'
+      - cloud:
+          provisioner-type: 'heat'
+          slave-type: 'jumphost'
 
     phase:
       - deploy:
           build-timeout: 90
       - functest:
-          build-timeout: 30
+          build-timeout: 60
 
     jobs:
-      - 'cloud-infra-verify-engine-{distro}-{type}-{stream}'
+      - 'cloud-infra-verify-engine-{distro}-{cloud}-{type}-{stream}'
       - 'cloud-infra-verify-engine-{distro}-{phase}-{type}-{stream}'
 
 - job-template:
-    name: 'cloud-infra-verify-engine-{distro}-{type}-{stream}'
+    name: 'cloud-infra-verify-engine-{distro}-{cloud}-{type}-{stream}'
 
     project-type: multijob
 
@@ -96,16 +102,28 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: '{slave-label}'
+          default: '{cloud}-{slave-type}-{distro}'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
           name: DISTRO
           default: '{distro}'
           description: 'Distribution to use for configuring target nodes (networking etc.)'
+      - string:
+          name: PROVISIONER_TYPE
+          default: '{provisioner-type}'
+          description: 'Provisioner type to use'
       - string:
           name: DEPLOY_TYPE
           default: '{type}'
           description: 'Type of the deployment'
+      - string:
+          name: HEAT_ENVIRONMENT_FILENAME
+          default: 'heat-environment-{cloud}-{distro}.yaml'
+          description: 'Name of heat-environment file to use.'
+      - string:
+          name: STACK_NAME
+          default: "nordix-cicd-verify-engine-{distro}-$BUILD_NUMBER"
+          description: 'Name of the created stack'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'true'
@@ -118,6 +136,10 @@
           name: YARDSTICK_DISPATCHER
           default: 'file'
           description: 'Dispatcher to use for Yardstick reporting'
+      - string:
+          name: DELETE_STACK
+          default: 'yes'
+          description: 'Delete the stack upon completion of the build'
       - string:
           name: CLEANUP
           default: 'true'
@@ -142,7 +164,7 @@
     wrappers:
       - credentials-binding:
           - file:
-              credential-id: est-jenkins-openrcfile-city-karlskrona-onap
+              credential-id: '{openrc-credentials-file}'
               variable: OPENRC_FILE
       - mask-passwords
       - build-timeout:
@@ -202,6 +224,9 @@
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
+                STACK_NAME=$STACK_NAME
+                HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
                 CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
@@ -221,6 +246,9 @@
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
+                STACK_NAME=$STACK_NAME
+                HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
                 TEST_SUITE=$TEST_SUITE
                 YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
@@ -234,6 +262,22 @@
               kill-phase-on: FAILURE
               abort-all-job: true
 
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: SLAVE
+              build-on:
+                - SUCCESS
+                - FAILURE
+                - ABORTED
+                - NOT_BUILT
+                - UNSTABLE
+              build-steps:
+                - shell:
+                    !include-raw-escape: ./wait-for-pkg-manager.sh
+                - shell:
+                    !include-raw: ./delete-heat-stack.sh
+
 - job-template:
     name: 'cloud-infra-verify-engine-{distro}-{phase}-{type}-{stream}'
 
@@ -256,6 +300,22 @@
           name: DEPLOY_TYPE
           default: 'virtual'
           description: 'Type of the deployment. Overriden by upstream job.'
+      - string:
+          name: PROVISIONER_TYPE
+          default: 'bifrost'
+          description: 'Provisioner type to use. Overriden by upstream job.'
+      - string:
+          name: HEAT_ENVIRONMENT_FILENAME
+          default: "heat-environment-city-ubuntu1804.yaml"
+          description: 'Name of heat-environment file to use.'
+      - string:
+          name: HEAT_ENVIRONMENT_FILE
+          default: "file://$WORKSPACE/engine/provisioner/heat/playbooks/roles/install-configure-heat/files/$HEAT_ENVIRONMENT_FILENAME"
+          description: 'Location of heat-environment file to use.'
+      - string:
+          name: STACK_NAME
+          default: "nordix-cicd-verify-engine-{distro}-$BUILD_NUMBER"
+          description: 'Name of the created stack'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'false'
@@ -281,10 +341,6 @@
           default: 'false'
 
     wrappers:
-      - credentials-binding:
-          - file:
-              credential-id: est-jenkins-openrcfile-city-karlskrona-onap
-              variable: OPENRC_FILE
       - mask-passwords
       - build-timeout:
           timeout: '{build-timeout}'