Add guilin stream for onap

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

diff --git a/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml b/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
index 814cf3fd6841bcd404e639ef609b13a732c44cce..3b73628acfc006fe459ddbda284134c24e770685 100644 (file)
--- a/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
@@ -24,6 +24,10 @@
 
     stream:
       - 'master':
+          branch: '{stream}'
+          k8s-version: '1.15'
+          deploy-scenario: 'onap-full-nofeature'
+      - 'guilin':
           branch: '{stream}'
           k8s-version: '1.15'
           deploy-scenario: 'onap-sdc-nofeature'
@@ -176,7 +180,7 @@
           wipe-workspace: true
     wrappers:
       - build-timeout:
-          timeout: 300
+          timeout: 600
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
@@ -210,7 +214,6 @@
                 fi
 
     builders:
-      - 'generate-release-metadata-macro'
       - 'generate-k8sdeployment-environment-macro'
       - multijob:
           name: "{environment-type} deployment on {type} instances"
@@ -230,7 +233,6 @@
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: false
-              property-file: $WORKSPACE/release.properties
     publishers:
       - postbuildscript:
           builders:
@@ -261,7 +263,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 300
+          timeout: 600
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
@@ -294,7 +296,7 @@
           option: project
     wrappers:
       - build-timeout:
-          timeout: 300
+          timeout: 600
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'