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 chlorine
[releng/builder.git]
/
jjb
/
integration
/
common-functions.sh
diff --git
a/jjb/integration/common-functions.sh
b/jjb/integration/common-functions.sh
index 85c16ee197f12596fa2a3db1e9ffe3804a4fbcee..801aa9c84ce44c7de20d713c4e62e4bd876a6fdc 100644
(file)
--- a/
jjb/integration/common-functions.sh
+++ b/
jjb/integration/common-functions.sh
@@
-915,11
+915,15
@@
if [[ "$USEFEATURESBOOT" == "True" ]]; then
fi
FEATURE_TEST_STRING="features-test"
fi
FEATURE_TEST_STRING="features-test"
+FEATURE_TEST_VERSION="$BUNDLE_VERSION"
+if [[ "$KARAF_ARTIFACT" == "opendaylight" ]]; then
+ FEATURE_TEST_VERSION="$(sed -r "s%^([0-9]+)\.([0-9]+)\.0(.*)%0.\1.\2\3%" <<<"$BUNDLE_VERSION")"
+fi
KARAF_VERSION=${KARAF_VERSION:-karaf4}
# only manipulate feature repo in integration distro
if [[ "$KARAF_PROJECT" == "integration" ]]; then
KARAF_VERSION=${KARAF_VERSION:-karaf4}
# only manipulate feature repo in integration distro
if [[ "$KARAF_PROJECT" == "integration" ]]; then
- sed -ie "s%\\(featuresRepositories=\\|featuresRepositories =\\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/
${BUNDLE
_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.2.0/xml/features,%g" ${FEATURESCONF}
+ sed -ie "s%\\(featuresRepositories=\\|featuresRepositories =\\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/
\${FEATURE_TEST
_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.2.0/xml/features,%g" ${FEATURESCONF}
if [[ ! -z "${REPO_URL}" ]]; then
sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
fi
if [[ ! -z "${REPO_URL}" ]]; then
sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
fi