X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-jobs%2Fonap-verify-deploy-test.yaml;h=5e8234f7eaa601ad0261a86a47e7f881bec6a28c;hb=3b5d5d8f359a4207872edf32773fdb72c3193eb7;hp=7f34bdff59e8e4f86a48935449ef908a069fa87c;hpb=26a5f16dbc5fdd8e213a33ea863df059a64d0149;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 7f34bdff5..5e8234f7e 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: '1.15'
+          k8s-version: 'master'
           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}'
@@ -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}'
@@ -222,6 +222,9 @@
     wrappers:
       - build-timeout:
           timeout: 600
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-nordix-gerrit-ssh'
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
@@ -294,6 +297,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 +437,7 @@
       - fix-workspace-permissions
 
     builders:
+      - 'download-xtesting-artifact-macro'
       - 'xtesting-infra-healthcheck-macro'
 
 - job-template:
@@ -471,5 +476,6 @@
       - fix-workspace-permissions
 
     builders:
+      - 'wait-pkg-mgr-macro'
       - 'xtesting-healthcheck-macro'