Merge "CI: jenkins jobs for upgrade tests"

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 efd13e740b58e5801244c4e355d1a2f0f851f66b..f1fd2517e3bc8c986bfa8a1d236e028ccc35ad1b 100644 (file)
--- a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
@@ -156,7 +156,7 @@
           description: 'Dispatcher to use for Yardstick reporting'
       - string:
           name: DELETE_STACK
-          default: 'true'
+          default: 'false'
           description: 'Delete the stack upon completion of the build'
       - string:
           name: VERBOSITY
@@ -272,7 +272,7 @@
       - multijob:
           name: "{environment-type} deployment on {type} instances"
           condition: SUCCESSFUL
-          execution-type: SEQUENTIAL
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'onap-verify-{environment-type}-deployk8s-{distro}-{cloud}-{type}-{stream}'
               current-parameters: true

diff --git a/jjb/onap/ccsdk-oran/ccsdk-oran-verify-jobs.yaml b/jjb/onap/ccsdk-oran/ccsdk-oran-verify-jobs.yaml
index 0ba8824a679c7d87c106320e44be16474d77fdd0..a0fbbacd1a919a668b0544eda76da9def9e36489 100644 (file)
--- a/jjb/onap/ccsdk-oran/ccsdk-oran-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-oran/ccsdk-oran-verify-jobs.yaml
@@ -27,7 +27,7 @@
 
     project-name: ccsdk-oran
 
-    jdk-version: java-11
+    jdk-version: sdk12
 
     stream:
       - master: