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 "Disable n-cpu service in Control Node"
[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 fb07c17d8443577694d81906d704518824fbaa5d..c2f592a7c5b5b22b2b570c432dc96e4479c24fa5 100644
(file)
--- a/
jjb/integration/include-raw-integration-get-bundle-vars.sh
+++ b/
jjb/integration/include-raw-integration-get-bundle-vars.sh
@@
-5,11
+5,13
@@
echo "#################################################"
NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
if [ ${BUNDLEURL} == 'last' ]; then
NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
if [ ${BUNDLEURL} == 'last' ]; then
- NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf"
+ # Obtain current pom.xml of integration/distribution, correct branch.
+ wget "http://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$BRANCH" -O "pom.xml"
# Extract the BUNDLEVERSION from the pom.xml
BUNDLEVERSION=`xpath pom.xml '/project/version/text()' 2> /dev/null`
echo "Bundle version is ${BUNDLEVERSION}"
# Acquire the timestamp information from maven-metadata.xml
# Extract the BUNDLEVERSION from the pom.xml
BUNDLEVERSION=`xpath pom.xml '/project/version/text()' 2> /dev/null`
echo "Bundle version is ${BUNDLEVERSION}"
# Acquire the timestamp information from maven-metadata.xml
+ NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf"
wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml
less maven-metadata.xml
TIMESTAMP=`xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null`
wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml
less maven-metadata.xml
TIMESTAMP=`xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null`
@@
-24,11
+26,20
@@
else
BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
fi
BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
fi
+if [ ${JDKVERSION} == 'openjdk8' ]; then
+ echo "Preparing for JRE Version 8"
+ JAVA_HOME="/usr/lib/jvm/java-1.8.0"
+elif [ ${JDKVERSION} == 'openjdk7' ]; then
+ echo "Preparing for JRE Version 7"
+ JAVA_HOME="/usr/lib/jvm/java-1.7.0"
+fi
+
echo "Distribution bundle URL is ${ACTUALBUNDLEURL}"
echo "Distribution bundle is ${BUNDLE}"
echo "Distribution bundle version is ${BUNDLEVERSION}"
echo "Distribution folder is ${BUNDLEFOLDER}"
echo "Nexus prefix is ${NEXUSURL_PREFIX}"
echo "Distribution bundle URL is ${ACTUALBUNDLEURL}"
echo "Distribution bundle is ${BUNDLE}"
echo "Distribution bundle version is ${BUNDLEVERSION}"
echo "Distribution folder is ${BUNDLEFOLDER}"
echo "Nexus prefix is ${NEXUSURL_PREFIX}"
+echo "Java home is ${JAVA_HOME}"
cat > ${WORKSPACE}/bundle_vars.txt <<EOF
ACTUALBUNDLEURL=${ACTUALBUNDLEURL}
cat > ${WORKSPACE}/bundle_vars.txt <<EOF
ACTUALBUNDLEURL=${ACTUALBUNDLEURL}
@@
-36,6
+47,7
@@
BUNDLE=${BUNDLE}
BUNDLEVERSION=${BUNDLEVERSION}
BUNDLEFOLDER=${BUNDLEFOLDER}
NEXUSURL_PREFIX=${NEXUSURL_PREFIX}
BUNDLEVERSION=${BUNDLEVERSION}
BUNDLEFOLDER=${BUNDLEFOLDER}
NEXUSURL_PREFIX=${NEXUSURL_PREFIX}
+JAVA_HOME=${JAVA_HOME}
EOF
# vim: ts=4 sw=4 sts=4 et ft=sh :
EOF
# vim: ts=4 sw=4 sts=4 et ft=sh :