X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-configure-clustering.sh;h=0fdcb9c587be2a2771f24f313e26e19dd0e6a16e;hb=cf656f63255c72362c5c3ca0106f49d3e84f3660;hp=5b1db13ec908f13a2ccd58676d2918d611fe6c38;hpb=580538afd2795b61a826ccd08195628c729d63cb;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-configure-clustering.sh b/jjb/integration/integration-configure-clustering.sh index 5b1db13ec..0fdcb9c58 100644 --- a/jjb/integration/integration-configure-clustering.sh +++ b/jjb/integration/integration-configure-clustering.sh @@ -1,179 +1,33 @@ +#!/bin/bash #@IgnoreInspection BashAddShebang # Activate robotframework virtualenv # ${ROBOT_VENV} comes from the integration-install-robotframework.sh # script. -# shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091 -source ${ROBOT_VENV}/bin/activate +# shellcheck disable=SC1090,SC1091 +source "${ROBOT_VENV}/bin/activate" +source /tmp/common-functions.sh "${BUNDLEFOLDER}" echo "#################################################" echo "## Configure Cluster and Start ##" echo "#################################################" -if [ ${CONTROLLERSCOPE} == 'all' ]; then - ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}" - export CONTROLLERMEM="3072m" -else - ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}" -fi -# Some versions of jenkins job builder result in feature list containing spaces -# and ending in newline. Remove all that. -ACTUALFEATURES=`echo "${ACTUALFEATURES}" | tr -d '\n \r'` +get_features -# Utility function for joining strings. -function join { - delim=' ' - final=$1; shift +# shellcheck disable=SC2034 +nodes_list=$(get_nodes_list) - for str in "$@" ; do - final=${final}${delim}${str} - done +run_plan "script" - echo ${final} -} +add_jvm_support -# Create the string for nodes -for i in `seq 1 ${NUM_ODL_SYSTEM}` ; do - CONTROLLERIP=ODL_SYSTEM_${i}_IP - nodes[$i]=${!CONTROLLERIP} -done +create_configuration_script -nodes_list=$(join "${nodes[@]}") +create_startup_script -echo ${nodes_list} +copy_and_run_configuration_script -# Run script plan in case it exists -if [ -f ${WORKSPACE}/test/csit/scriptplans/${TESTPLAN} ]; then - echo "scriptplan exists!!!" - echo "Reading the scriptplan:" - cat ${WORKSPACE}/test/csit/scriptplans/${TESTPLAN} | sed "s:integration:${WORKSPACE}:" > scriptplan.txt - cat scriptplan.txt - for line in $( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' scriptplan.txt ); do - echo "Executing ${line}..." - source ${line} - done -fi +run_plan "config" -# Create the configuration script to be run on controllers. -cat > ${WORKSPACE}/configuration-script.sh <> \${LOGCONF} - fi - done -fi -cat ${LOGCONF} - -if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then - echo "Enable the l3.fwd in custom.properties.." - echo "ovsdb.l3.fwd.enabled=yes" >> ${CUSTOMPROP} - cat ${CUSTOMPROP} -fi - -set_java_vars - -# Copy shard file if exists -if [ -f /tmp/custom_shard_config.txt ]; then - echo "Custom shard config exists!!!" - echo "Copying the shard config..." - cp /tmp/custom_shard_config.txt /tmp/${BUNDLEFOLDER}/bin/ -fi - -echo "Configuring cluster" -/tmp/${BUNDLEFOLDER}/bin/configure_cluster.sh \$1 ${nodes_list} - -echo "Dump akka.conf" -cat ${AKKACONF} - -echo "Dump modules.conf" -cat ${MODULESCONF} - -echo "Dump module-shards.conf" -cat ${MODULESHARDSCONF} - -EOF - -# Create the startup script to be run on controllers. -cat > ${WORKSPACE}/startup-script.sh < configplan.txt - cat configplan.txt - for line in $( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' configplan.txt ); do - echo "Executing ${line}..." - source ${line} - done -fi - -# Copy over the startup script to each controller and execute it. -for i in `seq 1 ${NUM_ODL_SYSTEM}` -do - CONTROLLERIP=ODL_SYSTEM_${i}_IP - echo "Starting member-${i} with IP address ${!CONTROLLERIP}" - scp ${WORKSPACE}/startup-script.sh ${!CONTROLLERIP}:/tmp/ - ssh ${!CONTROLLERIP} "bash /tmp/startup-script.sh" -done +copy_and_run_startup_script # vim: ts=4 sw=4 sts=4 et ft=sh :