AEGIS-455: Updated onap-verfiy-deploy jjb job template

[infra/cicd.git] / jjb / cloud-infra / onap-jobs / onap-verify-deploy-test.yaml

diff --git a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
index 7f34bdff59e8e4f86a48935449ef908a069fa87c..6caf4e9b6835caf99945bfbcf09f336adaeb4f6d 100644 (file)
--- a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
@@ -25,7 +25,7 @@
     stream:
       - 'master':
           branch: '{stream}'
-          k8s-version: '1.15'
+          k8s-version: 'master'
           deploy-scenario: 'onap-full-nofeature'
       - 'guilin':
           branch: '{stream}'
@@ -127,9 +127,9 @@
           default: '{execution-mode}'
           description: 'Execution mode to run in'
       - string:
-         name: STACK_TYPE
-         default: 'onap'
-         description: 'Stack to package, deploy, test, release'
+          name: STACK_TYPE
+          default: 'onap'
+          description: 'Stack to package, deploy, test, release'
       - string:
           name: PDF
           default: '{pdf}'
@@ -294,6 +294,7 @@
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: false
+              property-file: $WORKSPACE/change.properties
             - name: 'onap-verify-{environment-type}-xtesting-healthcheck-{distro}-{cloud}-{type}-{stream}'
               current-parameters: true
               git-revision: true
@@ -433,6 +434,7 @@
       - fix-workspace-permissions
 
     builders:
+      - 'download-xtesting-artifact-macro'
       - 'xtesting-infra-healthcheck-macro'
 
 - job-template:
@@ -471,5 +473,6 @@
       - fix-workspace-permissions
 
     builders:
+      - 'wait-pkg-mgr-macro'
       - 'xtesting-healthcheck-macro'