New optimized cluster deploy job:

[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 6cf3f5133119a26146e6dcb9bed6dbe5ed1f9e8c..fb07c17d8443577694d81906d704518824fbaa5d 100644 (file)
--- a/jjb/integration/include-raw-integration-get-bundle-vars.sh
+++ b/jjb/integration/include-raw-integration-get-bundle-vars.sh
@@ -1,24 +1,11 @@
 echo "#################################################"
-echo "## include-raw-integration-get-bundle_vars.txt ##"
+echo "##       Inject Global Variables               ##"
 echo "#################################################"
-set -x
-# Create a script to run controller inside a dynamic jenkins slave
-CONTROLLERMEM="2048m"
-DISTRIBUTION="karaf"
-
-
-
-if [ ${CONTROLLERSCOPE} == 'all' ]; then
-    CONTROLLERFEAT="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
-    CONTROLLERMEM="3072m"
-else
-    CONTROLLERFEAT="${CONTROLLERFEATURES}"
-fi
 
 NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
 
 if [ ${BUNDLEURL} == 'last' ]; then
-    NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-${DISTRIBUTION}"
+    NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf"
     # Extract the BUNDLEVERSION from the pom.xml
     BUNDLEVERSION=`xpath pom.xml '/project/version/text()' 2> /dev/null`
     echo "Bundle version is ${BUNDLEVERSION}"
@@ -27,39 +14,29 @@ if [ ${BUNDLEURL} == 'last' ]; then
     less maven-metadata.xml
     TIMESTAMP=`xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null`
     echo "Nexus timestamp is ${TIMESTAMP}"
-    BUNDLEFOLDER="distribution-${DISTRIBUTION}-${BUNDLEVERSION}"
-    BUNDLE="distribution-${DISTRIBUTION}-${TIMESTAMP}.zip"
-    BUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
+    BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
+    BUNDLE="distribution-karaf-${TIMESTAMP}.zip"
+    ACTUALBUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
 else
+    ACTUALBUNDLEURL="${BUNDLEURL}"
     BUNDLE="${BUNDLEURL##*/}"
     BUNDLEVERSION="$(basename $(dirname $BUNDLEURL))"
-    BUNDLEFOLDER="distribution-${DISTRIBUTION}-${BUNDLEVERSION}"
+    BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
 fi
 
-echo "Distribution bundle URL is ${BUNDLEURL}"
+echo "Distribution bundle URL is ${ACTUALBUNDLEURL}"
 echo "Distribution bundle is ${BUNDLE}"
+echo "Distribution bundle version is ${BUNDLEVERSION}"
 echo "Distribution folder is ${BUNDLEFOLDER}"
-
-
-# write the BUNDLE values into a HERE doc to later
-#  export to jenkins
+echo "Nexus prefix is ${NEXUSURL_PREFIX}"
 
 cat > ${WORKSPACE}/bundle_vars.txt <<EOF
-CONTROLLERFEAT=${CONTROLLERFEAT}
-CONTROLLERMEM=${CONTROLLERMEM}
-DISTRIBUTION=${DISTRIBUTION}
-TIMESTAMP=${TIMESTAMP}
-NEXUSURL_PREFIX=${NEXUSURL_PREFIX}
-NEXUSPATH=${NEXUSPATH}
+ACTUALBUNDLEURL=${ACTUALBUNDLEURL}
+BUNDLE=${BUNDLE}
 BUNDLEVERSION=${BUNDLEVERSION}
 BUNDLEFOLDER=${BUNDLEFOLDER}
-BUNDLE=${BUNDLE}
-ACTUALBUNDLEURL=${BUNDLEURL}
+NEXUSURL_PREFIX=${NEXUSURL_PREFIX}
 EOF
-set +x
-ls
-echo "#################################################"
-echo "## include-raw-integration-get-bundle_vars.txt ##"
-echo "#################################################"
 
+# vim: ts=4 sw=4 sts=4 et ft=sh :