X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-get-integration-test-variables.sh;h=95ff652ae7e723842b87c0239238304a5f995085;hb=974c9fbd94824d18a11d9adff6402a79d0052742;hp=8c4dc15e85f7743742c8548538ddb0468bdcdacd;hpb=9527fadeacdd2fcf7b0b65e8da9ea141601c2db6;p=releng%2Fbuilder.git diff --git a/jjb/autorelease/autorelease-get-integration-test-variables.sh b/jjb/autorelease/autorelease-get-integration-test-variables.sh index 8c4dc15e8..95ff652ae 100644 --- a/jjb/autorelease/autorelease-get-integration-test-variables.sh +++ b/jjb/autorelease/autorelease-get-integration-test-variables.sh @@ -14,13 +14,14 @@ # in cases where an internal ci system is using multiple NEXUS systems one for artifacts and another for staging, # we can override using ODLNEXUS_STAGING_URL to route the staging build to the 2nd server. # (most CI setups where a single Nexus server is used, ODLNEXUS_STAGING_URL should be left unset) -NEXUS_STAGING_URL=${ODLNEXUS_STAGING_URL:-$ODLNEXUSPROXY} +NEXUS_STAGING_URL="${ODLNEXUS_STAGING_URL:-$ODLNEXUSPROXY}" -NEXUSURL=${NEXUS_STAGING_URL}/content/repositories/ +NEXUSURL="${NEXUS_STAGING_URL}/content/repositories/" VERSION=$(grep -m2 '' "${WORKSPACE}/integration/distribution/${KARAF_ARTIFACT}/pom.xml" | tail -n1 | awk -F'[<|>]' '/version/ { printf $3 }') echo "VERSION: ${VERSION}" -STAGING_REPO_ID=$(grep "Created staging repository with ID" "$WORKSPACE/deploy-staged-repository.log" | cut -d '"' -f2) +STAGING_REPO_ID=$(grep "$NEXUS_STAGING_URL" "$WORKSPACE/archives/staging-repo.txt" | awk '{print $1}') BUNDLE_URL="${NEXUSURL}/${STAGING_REPO_ID}/org/opendaylight/integration/${KARAF_ARTIFACT}/${VERSION}/${KARAF_ARTIFACT}-${VERSION}.zip" +# shellcheck disable=SC2129 echo STAGING_REPO_ID="$STAGING_REPO_ID" >> "$WORKSPACE/variables.prop" echo BUNDLE_URL="$BUNDLE_URL" >> "$WORKSPACE/variables.prop" echo KARAF_VERSION="$KARAF_VERSION" >> "$WORKSPACE/variables.prop"