Merge changes from topic "eiffel-jjb"

* changes:
  eiffel: Fix etos-environment-provider git repo and Dockerfile
  eiffel: Create periodic build jobs for etos-test-runner-containers

diff --git a/jjb/acumos/push-upstream-jobs.sh b/jjb/acumos/push-upstream-jobs.sh
index 9354bfbbf1d0bf27d930ed4fb2bf9251a04e73f7..2aed5974029f3691869aca56d56f3171385d88b2 100755 (executable)
--- a/jjb/acumos/push-upstream-jobs.sh
+++ b/jjb/acumos/push-upstream-jobs.sh
@@ -58,9 +58,9 @@ acumos_remote_url="ssh://$username@$acumos_gerrit_base/$acumos_project"
 # GERRIT_TOPIC is the rest of the refspec after GERRIT_BRANCH when the topic
 # is set for the change.
 if [ -z "${GERRIT_TOPIC:-}" ] ; then
-    refspec="$commit_hash:refs/for/$GERRIT_BRANCH"
+    refspec="${commit_hash}:refs/for/${GERRIT_BRANCH}"
 else
-    refspec="$commit_hash:refs/for/$GERRIT_BRANCH/$GERRIT_TOPIC"
+    refspec="${commit_hash}:refs/for/${GERRIT_BRANCH}%topic=${GERRIT_TOPIC}"
 fi
 
 echo >&2 "Pushing to Acumos"

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..814cf3fd6841bcd404e639ef609b13a732c44cce 100644 (file)
--- a/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
@@ -112,11 +112,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 +176,7 @@
           wipe-workspace: true
     wrappers:
       - build-timeout:
-          timeout: 180
+          timeout: 300
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
@@ -230,7 +230,7 @@
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: false
-              property-file: $WORKSPACE/change.properties
+              property-file: $WORKSPACE/release.properties
     publishers:
       - postbuildscript:
           builders:
@@ -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..e3810cb5cf06a8b8ea01b91541e20d70c148d7de 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}'
@@ -211,7 +218,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 180
+          timeout: 300
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'

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/onap-jobs/onap-verify-package.yaml b/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
index 5820b5fd3389f0c9fd61bf80d409b74f0399a174..77c925d07aa37e09c9065ccd33496b911d99c6b4 100644 (file)
--- a/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
@@ -156,7 +156,7 @@
       - openstack:
           single-use: True
       - build-timeout:
-          timeout: 240
+          timeout: 300
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'

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)

diff --git a/jjb/fast-data-project/push-upstream-jobs.sh b/jjb/fast-data-project/push-upstream-jobs.sh
index 810e1b309abce5dc6f9bd6d0b94c77861181c565..099c75f7d951483457b9cc4828dfadbf3fe03cc6 100755 (executable)
--- a/jjb/fast-data-project/push-upstream-jobs.sh
+++ b/jjb/fast-data-project/push-upstream-jobs.sh
@@ -57,9 +57,9 @@ fdio_remote_url="ssh://$username@$fdio_gerrit_base/$fdio_project"
 # GERRIT_TOPIC is the rest of the refspec after GERRIT_BRANCH when the topic
 # is set for the change.
 if [ -z "${GERRIT_TOPIC:-}" ] ; then
-    refspec="$commit_hash:refs/for/$GERRIT_BRANCH"
+    refspec="${commit_hash}:refs/for/${GERRIT_BRANCH}"
 else
-    refspec="$commit_hash:refs/for/$GERRIT_BRANCH/$GERRIT_TOPIC"
+    refspec="${commit_hash}:refs/for/${GERRIT_BRANCH}%topic=${GERRIT_TOPIC}"
 fi
 
 echo >&2 "Pushing to FDio Gerrit"

diff --git a/jjb/onap/ccsdk-features/ccsdk-features-verify-jobs.yaml b/jjb/onap/ccsdk-features/ccsdk-features-verify-jobs.yaml
index 550daabb086fcf66771390e8b43a67697f98728d..f21946edfd00d043f755899254732158e39e7c76 100644 (file)
--- a/jjb/onap/ccsdk-features/ccsdk-features-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-features/ccsdk-features-verify-jobs.yaml
@@ -28,7 +28,7 @@
       - master:
           branch: '{stream}'
           jdk-version: java-11
-      - cps-poc:
+      - cps_poc:
           branch: '{stream}'
           jdk-version: java-11
     jobs:

diff --git a/jjb/onap/push-upstream-jobs.sh b/jjb/onap/push-upstream-jobs.sh
index 6557a18273971a325a4203e61f72e7498a87a208..67b7f246b42c9d97a60a37c9b2878f2469ccf420 100755 (executable)
--- a/jjb/onap/push-upstream-jobs.sh
+++ b/jjb/onap/push-upstream-jobs.sh
@@ -51,9 +51,9 @@ onap_remote_url="ssh://$username@$onap_gerrit_base/$onap_project"
 # GERRIT_TOPIC is the rest of the refspec after GERRIT_BRANCH when the topic
 # is set for the change.
 if [ -z "${GERRIT_TOPIC:-}" ] ; then
-    refspec="$commit_hash:refs/for/$GERRIT_BRANCH"
+    refspec="${commit_hash}:refs/for/${GERRIT_BRANCH}"
 else
-    refspec="$commit_hash:refs/for/$GERRIT_BRANCH/$GERRIT_TOPIC"
+    refspec="${commit_hash}:refs/for/${GERRIT_BRANCH}%topic=${GERRIT_TOPIC}"
 fi
 
 echo >&2 "Pushing to ONAP"

diff --git a/jjb/opendaylight/push-upstream-jobs.sh b/jjb/opendaylight/push-upstream-jobs.sh
index 19bfc4edaf11f163c1123d797acccff2210b82b2..f285230e7292cf012aed57cfa6c9408cf27b41cf 100755 (executable)
--- a/jjb/opendaylight/push-upstream-jobs.sh
+++ b/jjb/opendaylight/push-upstream-jobs.sh
@@ -69,9 +69,9 @@ opendaylight_remote_url="ssh://$username@$opendaylight_gerrit_base/$opendaylight
 # GERRIT_TOPIC is the rest of the refspec after GERRIT_BRANCH when the topic
 # is set for the change.
 if [ -z "${GERRIT_TOPIC:-}" ] ; then
-    refspec="$commit_hash:refs/for/$GERRIT_BRANCH"
+    refspec="${commit_hash}:refs/for/${GERRIT_BRANCH}"
 else
-    refspec="$commit_hash:refs/for/$GERRIT_BRANCH/$GERRIT_TOPIC"
+    refspec="${commit_hash}:refs/for/${GERRIT_BRANCH}%topic=${GERRIT_TOPIC}"
 fi
 
 echo >&2 "Pushing to OpenDaylight"

diff --git a/jjb/opendev/push-upstream-jobs.sh b/jjb/opendev/push-upstream-jobs.sh
index 0e1326f93126b8cb2345b53883319948bf4dda1a..7f2a696d24cea49d4ec1d9fd6de7e175e5817e4d 100755 (executable)
--- a/jjb/opendev/push-upstream-jobs.sh
+++ b/jjb/opendev/push-upstream-jobs.sh
@@ -58,9 +58,9 @@ opendev_remote_url="ssh://$username@$opendev_gerrit_base/$opendev_project"
 # GERRIT_TOPIC is the rest of the refspec after GERRIT_BRANCH when the topic
 # is set for the change.
 if [ -z "${GERRIT_TOPIC:-}" ] ; then
-    refspec="$commit_hash:refs/for/$GERRIT_BRANCH"
+    refspec="${commit_hash}:refs/for/${GERRIT_BRANCH}"
 else
-    refspec="$commit_hash:refs/for/$GERRIT_BRANCH/$GERRIT_TOPIC"
+    refspec="${commit_hash}:refs/for/${GERRIT_BRANCH}%topic=${GERRIT_TOPIC}"
 fi
 
 echo >&2 "Pushing to OpenDev"

diff --git a/jjb/oransc/push-upstream-jobs.sh b/jjb/oransc/push-upstream-jobs.sh
index 03f412f37b54a4ce669e54892b65f09d2c5f9ef2..7286aef45672fea6ed77b32f4bd39d9063f595e5 100755 (executable)
--- a/jjb/oransc/push-upstream-jobs.sh
+++ b/jjb/oransc/push-upstream-jobs.sh
@@ -51,9 +51,9 @@ oransc_remote_url="ssh://$username@$oransc_gerrit_base/$oransc_project"
 # GERRIT_TOPIC is the rest of the refspec after GERRIT_BRANCH when the topic
 # is set for the change.
 if [ -z "${GERRIT_TOPIC:-}" ] ; then
-    refspec="$commit_hash:refs/for/$GERRIT_BRANCH"
+    refspec="${commit_hash}:refs/for/${GERRIT_BRANCH}"
 else
-    refspec="$commit_hash:refs/for/$GERRIT_BRANCH/$GERRIT_TOPIC"
+    refspec="${commit_hash}:refs/for/${GERRIT_BRANCH}%topic=${GERRIT_TOPIC}"
 fi
 
 echo >&2 "Pushing to ORANSC Gerrit"