X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-detect-variables.sh;h=f2acb4c6e957acad7a48966daf7f0803ee0e12dd;hb=421bcb43ba10cb225d57b6af32312b05d29bbbe2;hp=542b0dcc1eac95dfd097cf2c68a0ef78328f5cbe;hpb=a18648639efb03b109ce8e447feb77b8edf7a251;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-detect-variables.sh b/jjb/integration/integration-detect-variables.sh index 542b0dcc1..f2acb4c6e 100644 --- a/jjb/integration/integration-detect-variables.sh +++ b/jjb/integration/integration-detect-variables.sh @@ -1,13 +1,17 @@ - +#!/bin/bash # TODO: Document the default values. NEXUSURL_PREFIX="${ODLNEXUSPROXY:-https://nexus.opendaylight.org}" ODL_NEXUS_REPO="${ODL_NEXUS_REPO:-content/repositories/opendaylight.snapshot}" GERRIT_PATH="${GERRIT_PATH:-git.opendaylight.org/gerrit}" DISTROBRANCH="${DISTROBRANCH:-$GERRIT_BRANCH}" -if [ ${BUNDLE_URL} == 'last' ]; then +if [ "${BUNDLE_URL}" == 'last' ]; then # Obtain current pom.xml of integration/distribution, correct branch. - wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml" + if [[ "$KARAF_ARTIFACT" == "opendaylight" ]]; then + wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=opendaylight/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml" + else + wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml" + fi # Extract the BUNDLE_VERSION from the pom.xml BUNDLE_VERSION="$(xpath pom.xml '/project/version/text()' 2> /dev/null)" echo "Bundle version is ${BUNDLE_VERSION}"