X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-jobs%2Fonap-verify-deploy-test.yaml;h=c92753036c802af2d9a54f5136e19639f66a5674;hb=3bdff39a39f3221eceaa07408d65c185fe75a38a;hp=0e93bb4aecd5b5edaf184b7d9fe5acc2371035c1;hpb=714952664a4a7b01b5d0ca2376bb2918a68c39ad;p=infra%2Fcicd.git

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 0e93bb4a..c9275303 100644
--- 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: 'master'
+          k8s-version: '1.19'
           deploy-scenario: 'onap-full-nofeature'
       - 'guilin':
           branch: '{stream}'
@@ -49,7 +49,7 @@
           unstable: false
           notbuilt: false
       - offline:
-          disabled: false
+          disabled: true
           execution-mode: offline-deployment
           successful: false
           failed: false
@@ -77,8 +77,8 @@
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
 
     # This should be
-    dependency-jobs: 'onap-verify-package-{distro}-{stream}'
-    dependency-job-var: 'TRIGGER_onap_verify_package_{distro}_{stream}_BUILD_RESULT'
+    dependency-jobs: 'onap-verify-tox-{stream}'
+    dependency-job-var: 'TRIGGER_onap_verify_tox_{stream}_BUILD_RESULT'
 
     jobs:
       - 'onap-verify-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}'
@@ -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,8 +434,7 @@
       - fix-workspace-permissions
 
     builders:
-      - 'download-deploy-artifact-macro'
-      - 'xtesting-healthcheck-macro'
+      - 'download-xtesting-artifact-macro'
       - 'xtesting-infra-healthcheck-macro'
 
 - job-template:
@@ -474,6 +474,5 @@
 
     builders:
       - 'wait-pkg-mgr-macro'
-      - 'download-deploy-artifact-macro'
       - 'xtesting-healthcheck-macro'