Update OOM build jobs to push to 'latest'

* Updated oom-upload.sh to also push built artifacts to a 'latest'
  location for later use
* Also update onap build/verify/release jobs for  master stream to
  use k8s master version

Signed-off-by: Cian Johnston <cian.johnston@est.tech>
Change-Id: I4881ef7004fb791d07088ff1f648a94c73e23e84

diff --git a/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml b/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
index db7acb7191c082cb8248f7396b794bc923d00abb..c7c6a0ccc5ee704f199b3a22d826a987a660eeea 100644 (file)
--- a/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
@@ -28,7 +28,7 @@
           branch: 'master'
           oom_branch: 'master'
           deploy-scenario: 'onap-full-nofeature'
-          k8s-version: '1.15'
+          k8s-version: 'master'
           promote-stack: 'false'
           container-tool: 'docker'
       - 'guilin':

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 f84d601dc67a0506a0ca14aa5f2f41662b58e950..0e93bb4aecd5b5edaf184b7d9fe5acc2371035c1 100644 (file)
--- a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
@@ -25,7 +25,7 @@
     stream:
       - 'master':
           branch: '{stream}'
-          k8s-version: '1.15'
+          k8s-version: 'master'
           deploy-scenario: 'onap-full-nofeature'
       - 'guilin':
           branch: '{stream}'

diff --git a/jjb/cloud-infra/scripts/oom-upload.sh b/jjb/cloud-infra/scripts/oom-upload.sh
index 02197cfa90bd659abaf51a5c3cd821283b95b671..904c58fe9adf024eb6dcee197f5fff451bc1d2bc 100644 (file)
--- a/jjb/cloud-infra/scripts/oom-upload.sh
+++ b/jjb/cloud-infra/scripts/oom-upload.sh
@@ -21,20 +21,27 @@
 set -o errexit
 set -o pipefail
 
+YQ_BIN="${WORKSPACE}/bin/yq"
+ONAP_OOM_VERSION=$(${YQ_BIN} e '.version' "${WORKSPACE}/build/onap-oom/kubernetes/onap/Chart.yaml")
+ONAP_OOM_VERSION_LATEST=$(echo "${ONAP_OOM_VERSION}" | sed 's#+.\+#+latest#')
+
 ONAP_OOM_GIT_REVISION=$(cd "${WORKSPACE}/build/onap-oom" && git rev-parse --short HEAD)
-ONAP_UMBRELLA_CHART=$(find ${WORKSPACE}/build/onap-oom/kubernetes/dist/packages -name onap-*${ONAP_OOM_GIT_REVISION}.tgz)
-IMAGES_LIST=$(find ${WORKSPACE} -maxdepth 1 -name onap-*${ONAP_OOM_GIT_REVISION}_images.txt)
+ONAP_UMBRELLA_CHART=$(find ${WORKSPACE}/build/onap-oom/kubernetes/dist/packages -name onap-${ONAP_OOM_VERSION}.tgz)
+IMAGES_LIST=$(find ${WORKSPACE} -maxdepth 1 -name onap-${ONAP_OOM_VERSION}_images.txt)
 
 export NORDIX_ARM_REPO="onap"
 export ARTIFACT_ARM_FOLDER="oom"
 export BUILD_IDENTIFIER="${ONAP_OOM_GIT_REVISION}"
 export NORDIX_ARTIFACT_URL="${NORDIX_ARM_HTTPS_URL}/${NORDIX_ARM_REPO}/${ARTIFACT_ARM_FOLDER}/${BUILD_IDENTIFIER}"
+export NORDIX_ARTIFACT_URL_LATEST="${NORDIX_ARM_HTTPS_URL}/${NORDIX_ARM_REPO}/${ARTIFACT_ARM_FOLDER}/latest"
 
 echo "Info  : Pushing ONAP umbrella chart to Nordix Harbor"
 HELM_BIN="${WORKSPACE}/bin/helm"
 ${HELM_BIN} repo remove onaptest || true
 ${HELM_BIN} repo add onaptest "${NORDIX_REGISTRY}/chartrepo/onaptest"
 ${HELM_BIN} push -f "${ONAP_UMBRELLA_CHART}" --username "${HARBOR_USERNAME}" --password "${HARBOR_PASSWORD}" onaptest
+# Also push with "latest" version
+${HELM_BIN} push -f "${ONAP_UMBRELLA_CHART}" --username "${HARBOR_USERNAME}" --password "${HARBOR_PASSWORD}" --version "${ONAP_OOM_VERSION_LATEST}" onaptest
 
 export BUILD_ARTIFACTS="${ONAP_UMBRELLA_CHART} ${IMAGES_LIST}"
 echo "Info  : Uploading ${BUILD_ARTIFACTS} to Nordix ARM ${NORDIX_ARM_REPO} repository"
@@ -45,8 +52,10 @@ for BUILD_ARTIFACT in $BUILD_ARTIFACTS; do
   ARTIFACT_SHA256SUM=$(sha256sum "${BUILD_ARTIFACT}" | cut -d' ' -f1)
 
   REMOTE_ARTIFACT=$(basename "${BUILD_ARTIFACT}")
+  REMOTE_ARTIFACT_LATEST=$(echo "${REMOTE_ARTIFACT}" | sed 's#+.\+#+latest#')
   # NOTE(cian): URL-encoding remote artifact as filename may contain special characters
-  REMOTE_ARTIFACT=$(echo -n "${REMOTE_ARTIFACT}" | python3 -c 'from sys import stdout, stdin; from urllib.parse import quote; stdout.write(quote(stdin.read()))')
+  REMOTE_ARTIFACT_QUOTED=$(echo -n "${REMOTE_ARTIFACT}" | python3 -c 'from sys import stdout, stdin; from urllib.parse import quote; stdout.write(quote(stdin.read()))')
+  REMOTE_ARTIFACT_LATEST_QUOTED=$(echo -n "${REMOTE_ARTIFACT_LATEST}" | python3 -c 'from sys import stdout, stdin; from urllib.parse import quote; stdout.write(quote(stdin.read()))')
 
   echo "Info  : Uploading ${BUILD_ARTIFACT} to Nordix Artifactory"
   curl -s -S \
@@ -56,7 +65,15 @@ for BUILD_ARTIFACT in $BUILD_ARTIFACTS; do
       -H "X-Checksum-Sha256:${ARTIFACT_SHA256SUM}" \
       -T "${BUILD_ARTIFACT}" \
       "${NORDIX_ARTIFACT_URL}/${REMOTE_ARTIFACT}"
-  echo "Info  : Artifact ${BUILD_ARTIFACT} is available on ${NORDIX_ARTIFACT_URL}/${REMOTE_ARTIFACT}"
+  echo "Info  : Artifact ${BUILD_ARTIFACT} is available on ${NORDIX_ARTIFACT_URL}/${REMOTE_ARTIFACT_QUOTED}"
+  curl -s -S \
+      -H "X-JFrog-Art-Api:${NORDIX_ARM_TOKEN}" \
+      -H "X-Checksum-MD5:${ARTIFACT_MD5SUM}" \
+      -H "X-Checksum-Sha1:${ARTIFACT_SHASUM}" \
+      -H "X-Checksum-Sha256:${ARTIFACT_SHA256SUM}" \
+      -T "${BUILD_ARTIFACT}" \
+      "${NORDIX_ARTIFACT_URL_LATEST}/${REMOTE_ARTIFACT_LATEST}"
+  echo "Info  : Artifact ${BUILD_ARTIFACT} is also available on ${NORDIX_ARTIFACT_URL_LATEST}/${REMOTE_ARTIFACT_LATEST_QUOTED}"
 done
 
 echo "Done!"

diff --git a/jjb/onap/oom/oom-build-jobs.yaml b/jjb/onap/oom/oom-build-jobs.yaml
index fdee2cf9ff1d83ccfdbabee99cec37c1b6164545..058d3d3e08f9563f2e28f7fbbe0a8264e28e75c0 100644 (file)
--- a/jjb/onap/oom/oom-build-jobs.yaml
+++ b/jjb/onap/oom/oom-build-jobs.yaml
@@ -83,43 +83,46 @@
             .global.ingress.enabled=true,
             .global.serviceMesh.enabled=true,
             .global.metrics.enabled=true,
+            .global.addTestingComponents=true,
+            .a1policymanagement.enabled=true,
             .aaf.enabled=true,
             .aai.enabled=true,
             .appc.enabled=true,
             .cassandra.enabled=true,
             .cds.enabled=true,
+            .cert-wrapper.enabled=true,
             .clamp.enabled=true,
             .cli.enabled=true,
             .consul.enabled=true,
+            .contrib.enabled=true,
+            .contrib.awx.enabled=false,
+            .contrib.netbox.enabled=false,
             .cps.enabled=true,
             .dcaegen2.enabled=true,
             .dcaegen2-services.enabled=true,
             .dcaemod.enabled=true,
-            .holmes.enabled=true,
             .dmaap.enabled=true,
             .esr.enabled=true,
-            .sniro-emulator.enabled=true,
+            .sniro-emulator.enabled=false,
             .oof.enabled=true,
             .mariadb-galera.enabled=true,
+            .modeling.enabled=true,
             .msb.enabled=true,
             .multicloud.enabled=true,
             .nbi.enabled=true,
+            .platform.enabled=true,
             .policy.enabled=true,
-            .pomba.enabled=true,
+            .pomba.enabled=false,
             .portal.enabled=true,
+            .repository-wrapper.enabled=true,
             .robot.enabled=true,
             .sdc.enabled=true,
             .sdnc.enabled=true,
             .so.enabled=true,
-            .uui.enabled=true,
-            .vfc.enabled=true,
+            .uui.enabled=false,
+            .vfc.enabled=false,
             .vid.enabled=true,
-            .vndsdk.enabled=true,
-            .modeling.enabled=true,
-            .platform.enabled=true,
-            .a1policymanagement.enabled=true,
-            .cert-wrapper.enabled=true,
-            .repository-wrapper.enabled=true
+            .vndsdk.enabled=true
       - string:
           name: ONAP_OOM_HELM_CHART_VALUES_OVERRIDE
           default: ''