Merge "Auto Update CSIT Jobs to run for aluminium"

[releng/builder.git] / jjb / integration / common-functions.sh

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index 33b3f64c6f9b01f0cabf7afed10a13097eecafc3..e7a7b4afbebd6bb2621c12c7b5b831f9e95b594c 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -10,7 +10,7 @@ export FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
 export CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties
 export LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
 export MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
-export CONTROLLERMEM="2048m"
+export CONTROLLERMEM=${CONTROLLERMAXMEM}
 
 # Cluster specific configuration settings
 export AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf
@@ -292,16 +292,7 @@ function add_jvm_support()
 {
     if [ "${ELASTICSEARCHATTRIBUTE}" != "disabled" ]; then
         set_elasticsearch_attribute "${ELASTICSEARCHATTRIBUTE}"
-        #run_script="${WORKSPACE}/test/csit/scripts/set_elasticsearch_attribute.sh ${ELASTICSEARCHATTRIBUTE}"
-        #printf "Executing %s...\\n" "${run_script}"
-        ## shellcheck source=${line} disable=SC1091
-        #source "${run_script}"
-
         set_jvm_common_attribute
-        #run_script="${WORKSPACE}/test/csit/scripts/set_jvm_common_attribute.sh"
-        #printf "Executing %s...\\n" "${run_script}"
-        ## shellcheck source=${line} disable=SC1091
-        #source "${run_script}"
     fi
 } # function add_jvm_support()
 
@@ -340,10 +331,9 @@ echo "Copying config files to ODL Controller folder"
 for i in $(seq 1 ${NUM_ODL_SYSTEM})
 do
         CONTROLLERIP=ODL_SYSTEM_${i}_IP
-        echo "Setup long duration config to ${!CONTROLLERIP}"
-        # We purposely want these variables to expand client-side
+        echo "Set Decanter Polling Period to ${!CONTROLLERIP}"
         # shellcheck disable=SC2029
-        ssh "${!CONTROLLERIP}" "mkdir -p /tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/"
+        ssh "${!CONTROLLERIP}" "mkdir -p \"/tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/\""
         scp "${WORKSPACE}"/org.apache.karaf.decanter.scheduler.simple.cfg "${!CONTROLLERIP}":/tmp/"${BUNDLEFOLDER}"/etc/
 done
 } #function set_elasticsearch_attribute
@@ -368,19 +358,10 @@ EOF
 for i in $(seq 1 ${NUM_ODL_SYSTEM})
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
-    CLUSTERNAME=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 12)
 
     cat > "${WORKSPACE}"/elasticsearch.yml <<EOF
-    cluster.name: ${CLUSTERNAME}
-    network.host: ${!CONTROLLERIP}
     discovery.zen.ping.multicast.enabled: false
 
-EOF
-    cat > "${WORKSPACE}"/org.apache.karaf.decanter.appender.elasticsearch.cfg <<EOF
-    host=${!CONTROLLERIP}
-    port=9300
-    clusterName=${CLUSTERNAME}
-
 EOF
 
     cat > "${WORKSPACE}"/elasticsearch_startup.sh <<EOF
@@ -403,23 +384,17 @@ EOF
 
 EOF
     echo "Setup ODL_SYSTEM_IP specific config files for ${!CONTROLLERIP} "
-
-    cat "${WORKSPACE}"/org.apache.karaf.decanter.appender.elasticsearch.cfg
     cat "${WORKSPACE}"/org.apache.karaf.decanter.collector.jmx-local.cfg
     cat "${WORKSPACE}"/org.apache.karaf.decanter.collector.jmx-others.cfg
     cat "${WORKSPACE}"/elasticsearch.yml
 
 
     echo "Copying config files to ${!CONTROLLERIP}"
-
-    scp "${WORKSPACE}"/org.apache.karaf.decanter.appender.elasticsearch.cfg "${!CONTROLLERIP}":/tmp/"${BUNDLEFOLDER}"/etc/
     scp "${WORKSPACE}"/org.apache.karaf.decanter.collector.jmx-local.cfg "${!CONTROLLERIP}":/tmp/"${BUNDLEFOLDER}"/etc/
     scp "${WORKSPACE}"/org.apache.karaf.decanter.collector.jmx-others.cfg "${!CONTROLLERIP}":/tmp/"${BUNDLEFOLDER}"/etc/
-
     scp "${WORKSPACE}"/elasticsearch.yml "${!CONTROLLERIP}":/tmp/
 
     ssh "${!CONTROLLERIP}" "sudo ls -al /tmp/elasticsearch/"
-
     ssh "${!CONTROLLERIP}" "sudo mv /tmp/elasticsearch.yml /tmp/elasticsearch/elasticsearch-1.7.5/config/"
     ssh "${!CONTROLLERIP}" "cat /tmp/elasticsearch/elasticsearch-1.7.5/config/elasticsearch.yml"
 
@@ -489,6 +464,7 @@ DISTROSTREAM: ${DISTROSTREAM}
 BUNDLE_URL: ${BUNDLE_URL}
 CONTROLLERFEATURES: ${CONTROLLERFEATURES}
 CONTROLLERDEBUGMAP: ${CONTROLLERDEBUGMAP}
+CONTROLLERMAXMEM: ${CONTROLLERMAXMEM}
 SCRIPTPLAN: ${SCRIPTPLAN}
 CONFIGPLAN: ${CONFIGPLAN}
 STREAMTESTPLAN: ${STREAMTESTPLAN}
@@ -882,14 +858,19 @@ function get_nodes_list() {
 function get_features() {
     if [ "${CONTROLLERSCOPE}" == 'all' ]; then
         ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
-        export CONTROLLERMEM="3072m"
+        # if CONTROLLERMEM still is the default 2G and was not overridden by a
+        # custom job, then we need to make sure to increase it because "all"
+        # features can be heavy
+        if [ "${CONTROLLERMEM}" == "2048m" ]; then
+            export CONTROLLERMEM="3072m"
+        fi
     else
         ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}"
     fi
 
     if [ "${ELASTICSEARCHATTRIBUTE}" != "disabled" ]; then
         # Add decanter features to allow JVM monitoring
-        ACTUALFEATURES="${ACTUALFEATURES},decanter-collector-jmx,decanter-appender-elasticsearch"
+        ACTUALFEATURES="${ACTUALFEATURES},decanter-collector-jmx,decanter-appender-elasticsearch-rest"
     fi
 
     # Some versions of jenkins job builder result in feature list containing spaces
@@ -936,7 +917,7 @@ if [[ "$KARAF_VERSION" == "karaf4" ]]; then
     FEATURE_TEST_STRING="features-test"
 fi
 
-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.0.0/xml/features,%g" ${FEATURESCONF}
+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}
 if [[ ! -z "${REPO_URL}" ]]; then
    sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
 fi
@@ -1001,7 +982,7 @@ sshpass -p karaf ssh -o StrictHostKeyChecking=no \
                      -o UserKnownHostsFile=/dev/null \
                      -o LogLevel=error \
                      -p 8101 karaf@localhost \
-                     "bundle:refresh org.apache.karaf.decanter.collector.jmx && bundle:refresh org.apache.karaf.decanter.appender.elasticsearch"
+                     "bundle:refresh org.apache.karaf.decanter.collector.jmx && bundle:refresh org.apache.karaf.decanter.api"
 
 if [[ "$USEFEATURESBOOT" != "True" ]]; then
 
@@ -1034,7 +1015,7 @@ done;
 
 # if we ended up not finding ready status in the above loop, we can output some debugs
 grep 'org.opendaylight.infrautils.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
-if [ $? -ne 0 ]; then
+if [ \$? -ne 0 ]; then
     echo "Timeout Controller DOWN"
     echo "Dumping first 500K bytes of karaf log..."
     head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"