Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Auto Update CSIT Jobs to run for oxygen
[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 009e0fe4b45304a406a4614e27b4067bd5cab0e0..f28711cd8b736bf32b786c9500b0135639842280 100644
(file)
--- a/
jjb/integration/integration-detect-variables.sh
+++ b/
jjb/integration/integration-detect-variables.sh
@@
-20,16
+20,12
@@
if [ ${BUNDLE_URL} == 'last' ]; then
BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
-elif [[ "${BUNDLE_URL}" == *"distribution-check"* ]]; then
- ACTUAL_BUNDLE_URL="${BUNDLE_URL}"
- BUNDLE="${BUNDLE_URL##*/}"
- BUNDLEFOLDER="${BUNDLE//.zip}"
- BUNDLEVERSION="${BUNDLEFOLDER//$KARAF_ARTIFACT-}"
else
ACTUAL_BUNDLE_URL="${BUNDLE_URL}"
BUNDLE="${BUNDLE_URL##*/}"
else
ACTUAL_BUNDLE_URL="${BUNDLE_URL}"
BUNDLE="${BUNDLE_URL##*/}"
+ ARTIFACT="$(basename "$(dirname "$(dirname "${BUNDLE_URL}")")")"
BUNDLEVERSION="$(basename "$(dirname "${BUNDLE_URL}")")"
BUNDLEVERSION="$(basename "$(dirname "${BUNDLE_URL}")")"
- BUNDLEFOLDER="${
KARAF_
ARTIFACT}-${BUNDLEVERSION}"
+ BUNDLEFOLDER="${ARTIFACT}-${BUNDLEVERSION}"
fi
echo "Distribution bundle URL is ${ACTUAL_BUNDLE_URL}"
fi
echo "Distribution bundle URL is ${ACTUAL_BUNDLE_URL}"