Fix: Update lf-activate-venv

[releng/builder.git] / jjb / integration / integration-detect-variables.sh

diff --git a/jjb/integration/integration-detect-variables.sh b/jjb/integration/integration-detect-variables.sh
index fddb2f9670396a5b9bc1778e4fe2f2d1d563c829..925192c07ec5e32cf83c76b46e8ef6515e1ef4f5 100644 (file)
--- a/jjb/integration/integration-detect-variables.sh
+++ b/jjb/integration/integration-detect-variables.sh
@@ -15,17 +15,23 @@ if [ "${BUNDLE_URL}" == 'last' ]; then
         wget "http://${GERRIT_PATH}/gitweb?p=${KARAF_PROJECT}.git;a=blob_plain;f=karaf/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
     elif [[ "$KARAF_ARTIFACT" == "controller-test-karaf" ]]; then
         wget "http://${GERRIT_PATH}/gitweb?p=${KARAF_PROJECT}.git;a=blob_plain;f=karaf/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
+    elif [[ "$KARAF_ARTIFACT" == "bgpcep-karaf" ]]; then
+        wget "http://${GERRIT_PATH}/gitweb?p=${KARAF_PROJECT}.git;a=blob_plain;f=distribution-karaf/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)"
+    # TODO: remove the second xpath command once the old version in CentOS 7 is not used any more
+    BUNDLE_VERSION=$(xpath -e '/project/version/text()' pom.xml 2>/dev/null ||
+        xpath pom.xml '/project/version/text()' 2>/dev/null)
     echo "Bundle version is ${BUNDLE_VERSION}"
     # Acquire the timestamp information from maven-metadata.xml
     NEXUSPATH="${NEXUSURL_PREFIX}/${ODL_NEXUS_REPO}/org/opendaylight/${KARAF_PROJECT}/${KARAF_ARTIFACT}"
     wget "${NEXUSPATH}/${BUNDLE_VERSION}/maven-metadata.xml"
     less "maven-metadata.xml"
-    TIMESTAMP="$(xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null)"
+    # TODO: remove the second xpath command once the old version in CentOS 7 is not used any more
+    TIMESTAMP=$(xpath -e "//snapshotVersion[extension='zip'][1]/value/text()" maven-metadata.xml 2>/dev/null ||
+        xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null)
     echo "Nexus timestamp is ${TIMESTAMP}"
     BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}"
     BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"