Consolidate py2 and py3 requirements files

[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 66e2df0d004c42426f923dec0f0fff18c8e03eef..f2acb4c6e957acad7a48966daf7f0803ee0e12dd 100644 (file)
--- a/jjb/integration/integration-detect-variables.sh
+++ b/jjb/integration/integration-detect-variables.sh
@@ -1,11 +1,11 @@
-
+#!/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.
     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"
@@ -24,15 +24,7 @@ if [ ${BUNDLE_URL} == 'last' ]; then
     BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}"
     BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
     ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLE_VERSION}/${BUNDLE}"
-elif [ ${BUNDLE_URL} == 'autorelease' ]; then
-    # Use latest stable AR job distribution URL
-    ACTUAL_BUNDLE_URL="$(curl -sL -X GET -H 'Accept:text/plain' https://jenkins.opendaylight.org/releng/view/autorelease/job/autorelease-release-$DISTROSTREAM/lastStableBuild/injectedEnvVars/export | grep BUNDLE_URL | tr -d 'BUNDLE_URL=')"
-    BUNDLE="${ACTUAL_BUNDLE_URL##*/}"
-    ARTIFACT="$(basename "$(dirname "$(dirname "${ACTUAL_BUNDLE_URL}")")")"
-    BUNDLE_VERSION="$(basename "$(dirname "${ACTUAL_BUNDLE_URL}")")"
-    BUNDLEFOLDER="${ARTIFACT}-${BUNDLE_VERSION}"
 else
-    # Use provided BUNDLE_URL
     ACTUAL_BUNDLE_URL="${BUNDLE_URL}"
     BUNDLE="${BUNDLE_URL##*/}"
     ARTIFACT="$(basename "$(dirname "$(dirname "${BUNDLE_URL}")")")"