X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-jobs%2Fonap-verify-deploy-test.yaml;h=73891e07344f2df19775febf499aae9952c33ab5;hb=cf3767a674c686c56bf9ae74fcb2cf4c1fb2e069;hp=4ac3caf38904ddd905ff9f49f159bc3daf31382a;hpb=d1f624a27b65afbabbcb482e91ea833b2e140193;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 4ac3caf3..73891e07 100644
--- a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
@@ -26,7 +26,11 @@
       - 'master':
           branch: '{stream}'
           k8s-version: '1.15'
-          deploy-scenario: 'onap-sdc-nofeature'
+          deploy-scenario: 'onap-full-nofeature'
+      - 'guilin':
+          branch: '{stream}'
+          k8s-version: '1.15'
+          deploy-scenario: 'onap-sdc-nofeature'          
       - 'frankfurt':
           branch: '{stream}'
           k8s-version: '1.15'
@@ -77,6 +81,8 @@
 
     jobs:
       - 'onap-verify-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}'
+      - 'onap-verify-{environment-type}-deploy-{distro}-{cloud}-{type}-{stream}'
+      - 'onap-verify-{environment-type}-deployk8s-{distro}-{cloud}-{type}-{stream}'
 
 - job-template:
     name: 'onap-verify-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}'
@@ -154,7 +160,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
@@ -223,7 +229,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 180
+          timeout: 600
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
@@ -270,16 +276,16 @@
       - multijob:
           name: "{environment-type} deployment on {type} instances"
           condition: SUCCESSFUL
-          execution-type: SEQUENTIAL
+          execution-type: SEQUENTIALLY
           projects:
-            - name: 'onap-verify-{environment-type}-deployk8s-{distro}-city-{type}-{stream}'
+            - name: 'onap-verify-{environment-type}-deployk8s-{distro}-{cloud}-{type}-{stream}'
               current-parameters: true
               git-revision: true
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: false
               property-file: $WORKSPACE/k8s.properties
-            - name: 'onap-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}'
+            - name: 'onap-verify-{environment-type}-deploy-{distro}-{cloud}-{type}-{stream}'
               current-parameters: true
               git-revision: true
               node-parameters: true
@@ -324,7 +330,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 180
+          timeout: 600
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
@@ -366,7 +372,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 180
+          timeout: 600
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'