From: Andrew Fenner <Andrew.Fenner@est.tech>
Date: Wed, 14 Oct 2020 08:25:30 +0000 (+0000)
Subject: Merge "Update to allow release jobs to run"
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=1dcb2f01d3aa6a35940ab610458a823698ad479a;hp=01bea5e2a9533f6239174ef01e822ad1b4673938;p=infra%2Fcicd.git

Merge "Update to allow release jobs to run"
---

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 c0cd22d7..08a3eef1 100644
--- a/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
@@ -176,7 +176,7 @@
           wipe-workspace: true
     wrappers:
       - build-timeout:
-          timeout: 180
+          timeout: 300
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
@@ -261,7 +261,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 180
+          timeout: 300
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
@@ -294,7 +294,7 @@
           option: project
     wrappers:
       - build-timeout:
-          timeout: 180
+          timeout: 300
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
diff --git a/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml b/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
index 0a9c381c..94b174ab 100644
--- a/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
@@ -25,16 +25,19 @@
     stream:
       - 'master':
           branch: 'master'
+          oom_branch: 'master'
           deploy-scenario: 'onap-sdc-nofeature'
           k8s-version: '1.15'
           promote-stack: 'false'
       - 'frankfurt':
           branch: 'frankfurt'
+          oom_branch: 'master'
           deploy-scenario: 'onap-sdc-nofeature'
           k8s-version: '1.15'
           promote-stack: 'true'
       - 'elalto':
           branch: 'elalto'
+          oom_branch: 'master'
           deploy-scenario: 'onap-sdc-nofeature'
           k8s-version: '1.15'
           promote-stack: 'true'
@@ -114,6 +117,10 @@
           name: STACK_VERSION
           default: '{branch}'
           description: 'Stack version of engine to package, deploy, test, release'
+      - string:
+          name: NORDIX_OOM_VERSION
+          default: '{oom_branch}'
+          description: 'Stack version of oom to package, deploy, test, release'
       - string:
           name: PROMOTE_STACK
           default: '{promote-stack}'
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 f1fd2517..9f552698 100644
--- a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
@@ -225,7 +225,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 180
+          timeout: 300
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
@@ -326,7 +326,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 180
+          timeout: 300
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
@@ -368,7 +368,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 180
+          timeout: 300
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
diff --git a/jjb/cloud-infra/scripts/generate-k8sdeployment-environment.sh b/jjb/cloud-infra/scripts/generate-k8sdeployment-environment.sh
index d45ff85c..ca285a46 100644
--- a/jjb/cloud-infra/scripts/generate-k8sdeployment-environment.sh
+++ b/jjb/cloud-infra/scripts/generate-k8sdeployment-environment.sh
@@ -29,10 +29,6 @@ export K8S_DEPLOYMENT_FILE="$WORKSPACE/k8s.properties"
 
 echo "Info  : Generating k8s properties"
 
-# determine the project
-# this scripts is used by all engine repos so we need to determine what this change is for
-export ENGINE_COMPONENT="${GERRIT_PROJECT//*\//}"
-
 echo "Info  : Setting STACK_TYPE and STACK_VERSION"
 
 export STACK_TYPE="kubernetes"
diff --git a/jjb/cloud-infra/scripts/generate-release-metadata.sh b/jjb/cloud-infra/scripts/generate-release-metadata.sh
index 901fd8b3..bd9100ff 100755
--- a/jjb/cloud-infra/scripts/generate-release-metadata.sh
+++ b/jjb/cloud-infra/scripts/generate-release-metadata.sh
@@ -35,7 +35,6 @@ function record_component_versions() {
       echo "NORDIX_KUBESPRAY_VERSION=$NORDIX_KUBESPRAY_VERSION" >> $RELEASE_METADATA_FILE
       ;;
     onap)
-      echo "NORDIX_HEAT_VERSION=$NORDIX_HEAT_VERSION" >> $RELEASE_METADATA_FILE
       echo "NORDIX_OOM_VERSION=$NORDIX_OOM_VERSION" >> $RELEASE_METADATA_FILE
       ;;
     openstack)