Merge "onap-oom-helm-build: update build wrapper and upload scripts"

[infra/cicd.git] / jjb / cloud-infra / scripts / generate-change-metadata.sh

diff --git a/jjb/cloud-infra/scripts/generate-change-metadata.sh b/jjb/cloud-infra/scripts/generate-change-metadata.sh
index 878735d2c5b667a1a8f60944c1c54841c74ee92e..7517232223f6f36a5f7a0fea44dde353282250c2 100755 (executable)
--- a/jjb/cloud-infra/scripts/generate-change-metadata.sh
+++ b/jjb/cloud-infra/scripts/generate-change-metadata.sh
@@ -42,8 +42,15 @@ function determine_dependency() {
 
   echo "Info  : Processing change $DEPENDENT_CHANGE_ID"
   declare -a DEPENDENT_CHANGE_METADATA
-  readarray -t DEPENDENT_CHANGE_METADATA < <(curl -s "https://gerrit.nordix.org/changes/?q=$DEPENDENT_CHANGE_ID&o=CURRENT_REVISION" 2>&1 \
-      | grep "project\|status\|current_revision\|ref\".*," | sed -e 's/\s//g' -e 's/,//g' -e 's/"//g'| cut -d: -f2)
+  # NOTE (cian): upgrades to Gerrit appear to change the output of the previously-used endpoint
+  # https://gerrit.nordix.org/changes/?q=$DEPENDENT_CHANGE_ID&o=CURRENT_REVISION so moving to
+  # gerrit SSH-based queries instead
+  GIT_BASE_SSH_CMD=$(echo "${GIT_BASE_SSH}" | sed -e 's#://# #g' | sed -e 's#:# -p #g')
+  readarray -t DEPENDENT_CHANGE_METADATA < <(
+    ${GIT_BASE_SSH_CMD} gerrit query --format=json change:${DEPENDENT_CHANGE_ID} --current-patch-set |\
+      head -1 |\
+      jq -r '[.project, .status, .currentPatchSet.revision, .currentPatchSet.ref] | join("\n")'
+  )
 
   # NOTE (fdegir): check if the dependeny change exists
   # and ignore if it doesn't
@@ -171,6 +178,7 @@ export NORDIX_ARM_HTTPS_URL="https://artifactory.nordix.org/artifactory"
 export ARTIFACT_ARM_FOLDER="gerrit"
 export BUILD_IDENTIFIER=$GERRIT_CHANGE_NUMBER
 export OFFLINE_INSTALLER_FILE="/tmp/${STACK_TYPE}-${GERRIT_BRANCH}-${DISTRO}.bsx"
+export OFFLINE_XTESTING_FILE="/tmp/${STACK_TYPE}-test-${GERRIT_BRANCH}.bsx"
 export BUILD_ARTIFACTS="/tmp/${STACK_TYPE}-${GERRIT_BRANCH}-${DISTRO}.bsx"
 export NORDIX_ARM_REPO="nordix-${STACK_TYPE}"
 export NORDIX_ARTIFACT_URL="$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/oss/$ARTIFACT_ARM_FOLDER/$BUILD_IDENTIFIER"
@@ -183,6 +191,7 @@ DISTRO=$DISTRO
 CI_LOOP=$CI_LOOP
 ENGINE_SHA=$(git rev-parse HEAD)
 OFFLINE_INSTALLER_FILE=$OFFLINE_INSTALLER_FILE
+OFFLINE_XTESTING_FILE=$OFFLINE_XTESTING_FILE
 BUILD_ARTIFACTS=$BUILD_ARTIFACTS
 NORDIX_ARM_REPO=nordix-${STACK_TYPE}
 NORDIX_ARTIFACT_URL=$NORDIX_ARTIFACT_URL