X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fautorelease%2Finclude-raw-autorelease-get-integration-test-variables.sh;h=b90d959a788a8e96db8917d475239a3db424980c;hb=088d33c3407ca2f92b084840cd4c2f0e7b02446e;hp=c948eb48ad5d0676a15ef16ad0ec202c1ba42f33;hpb=856d4427480629e823bf8dae7a360a58bcd9df3e;p=releng%2Fbuilder.git diff --git a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh index c948eb48a..b90d959a7 100644 --- a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh +++ b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh @@ -17,13 +17,13 @@ NEXUS_STAGING_URL=${ODLNEXUS_STAGING_URL:-$ODLNEXUSPROXY} NEXUSURL=${NEXUS_STAGING_URL}/content/repositories/ -VERSION=$(grep -m2 '' "${WORKSPACE}/integration/distribution/distribution-karaf/pom.xml" | tail -n1 | awk -F'[<|>]' '/version/ { printf $3 }') +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) -BUNDLEURL="${NEXUSURL}/${STAGING_REPO_ID}/org/opendaylight/integration/distribution-karaf/${VERSION}/distribution-karaf-${VERSION}.zip" +BUNDLE_URL="${NEXUSURL}/${STAGING_REPO_ID}/org/opendaylight/integration/${KARAF_ARTIFACT}/${VERSION}/${KARAF_ARTIFACT}-${VERSION}.zip" echo STAGING_REPO_ID="$STAGING_REPO_ID" >> "$WORKSPACE/variables.prop" -echo BUNDLEURL="$BUNDLEURL" >> "$WORKSPACE/variables.prop" -echo "BUNDLEURL: ${BUNDLEURL}" +echo BUNDLE_URL="$BUNDLE_URL" >> "$WORKSPACE/variables.prop" +echo "BUNDLE_URL: ${BUNDLE_URL}" # Copy variables.prop to variables.jenkins-trigger so that the end of build # trigger can pick up the file as input for triggering downstream jobs.