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
Merge "Add boolean parameter to run test after build"
[releng/builder.git]
/
jjb
/
integration
/
include-raw-integration-get-bundle-vars.sh
diff --git
a/jjb/integration/include-raw-integration-get-bundle-vars.sh
b/jjb/integration/include-raw-integration-get-bundle-vars.sh
index 6c5f5cb467ca5193640c2bf13167d898cbc7e424..6b57c40272c8262ae5a7e4d9524b41f91de19928 100644
(file)
--- a/
jjb/integration/include-raw-integration-get-bundle-vars.sh
+++ b/
jjb/integration/include-raw-integration-get-bundle-vars.sh
@@
-22,11
+22,16
@@
if [ ${BUNDLEURL} == 'last' ]; then
BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
BUNDLE="distribution-karaf-${TIMESTAMP}.zip"
ACTUALBUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
BUNDLE="distribution-karaf-${TIMESTAMP}.zip"
ACTUALBUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
-el
se
+el
if [[ ${BUNDLEURL} == *"distribution-check"* ]]; then
ACTUALBUNDLEURL="${BUNDLEURL}"
BUNDLE="${BUNDLEURL##*/}"
BUNDLEFOLDER="${BUNDLE//.zip}"
BUNDLEVERSION="${BUNDLEFOLDER//distribution-karaf-}"
ACTUALBUNDLEURL="${BUNDLEURL}"
BUNDLE="${BUNDLEURL##*/}"
BUNDLEFOLDER="${BUNDLE//.zip}"
BUNDLEVERSION="${BUNDLEFOLDER//distribution-karaf-}"
+else
+ ACTUALBUNDLEURL="${BUNDLEURL}"
+ BUNDLE="${BUNDLEURL##*/}"
+ BUNDLEVERSION="$(basename $(dirname $BUNDLEURL))"
+ BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
fi
if [ ${JDKVERSION} == 'openjdk8' ]; then
fi
if [ ${JDKVERSION} == 'openjdk8' ]; then