Update to allow release jobs to run

Increase timeouts as ONAP is taking too long to unpack and install.
fix some missing paramters for release builds
remove unnecessary variable usage that broke release build

Change-Id: I2572b191ece95738856160f28cd37ca905ded61c
Signed-off-by: afenner <andrew.fenner@est.tech>

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 c0cd22d75fa8c61a8a73b136220573c89e56a3b4..08a3eef1920bfdb40e4e91e7b384e380143efc66 100644 (file)
--- 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 0a9c381c1a4d540f0875e62083a092287c2684a4..94b174abcaf9a72d44a737da0ce37c807c3f1924 100644 (file)
--- 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 f1fd2517e3bc8c986bfa8a1d236e028ccc35ad1b..9f552698aa6d3d5f7805f666f3002fd5e5d1534e 100644 (file)
--- 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 d45ff85cb33350eef84f775c5d5483e057d290b2..ca285a46aa063f7e56e6f49a39c912a94107131a 100644 (file)
--- 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 901fd8b3a4ea2e4836b8ebbbebb9e912c257ec8d..bd9100ff1ed00c7d8609bc55db06fb81977dfa28 100755 (executable)
--- 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)