X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-jobs%2Fonap-release-deploy-test.yaml;h=3b73628acfc006fe459ddbda284134c24e770685;hb=9440fd512af0b0abb8d690cc6b15b480374a35d3;hp=08a3eef1920bfdb40e4e91e7b384e380143efc66;hpb=1dcb2f01d3aa6a35940ab610458a823698ad479a;p=infra%2Fcicd.git

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 08a3eef1..3b73628a 100644
--- 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'
@@ -112,11 +116,11 @@
           description: 'IDF file to use for deployment'
       - string:
           name: HEAT_STACK_NAME
-          default: "nordix-cicd-verify-onap-{environment-type}-{distro}-$GERRIT_CHANGE_NUMBER"
+          default: "nordix-cicd-verify-onap-{environment-type}-{distro}-{stream}"
           description: 'Name of the created stack'
       - string:
           name: KEYPAIR_NAME
-          default: "keypair-nordix-cicd-verify-onap-{environment-type}-{distro}-$GERRIT_CHANGE_NUMBER"
+          default: "keypair-nordix-cicd-verify-onap-{environment-type}-{distro}-{stream}"
           description: 'Name of the created keypair'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
@@ -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/change.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}'