X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-deploy-controller-run-test.sh;h=20a536a4553ec25d2813478b3963123fe5e31bf6;hb=dab749f0e527e85d11cf90079fd7eaa1b08e39d9;hp=9fc28a881875a65597efdcb7d9c778bd5521bdac;hpb=05ac2c55032ba988df52a0c514915693ba5f5bfe;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh index 9fc28a881..20a536a45 100755 --- a/jjb/integration/integration-deploy-controller-run-test.sh +++ b/jjb/integration/integration-deploy-controller-run-test.sh @@ -6,241 +6,32 @@ source ${ROBOT_VENV}/bin/activate source /tmp/common-functions.sh ${BUNDLEFOLDER} -if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then - echo "Configure cluster" - AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf - MODULESCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/modules.conf - MODULESHARDSCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/module-shards.conf -fi - -if [ ${CONTROLLERSCOPE} == 'all' ]; then - ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}" - export CONTROLLERMEM="3072m" -else - ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}" -fi +echo "#################################################" +echo "## Configure Cluster and Start ##" +echo "#################################################" -# 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'` -echo "ACTUALFEATURES: ${ACTUALFEATURES}" +get_features -# In the case that we want to install features via karaf shell, a space separated list of -# ACTUALFEATURES IS NEEDED -SPACE_SEPARATED_FEATURES=$(echo "${ACTUALFEATURES}" | tr ',' ' ') -echo "SPACE_SEPARATED_FEATURES: ${SPACE_SEPARATED_FEATURES}" +# shellcheck disable=SC2034 +nodes_list=$(get_nodes_list) run_plan "script" -cat > ${WORKSPACE}/configuration-script.sh < ${WORKSPACE}/configuration-script.sh < ${WORKSPACE}/startup-script.sh < ${WORKSPACE}/startup-script.sh < ${WORKSPACE}/post-startup-script.sh < ${WORKSPACE}/post-startup-script.sh < ${WORKSPACE}/ps_before.log - pid=$(grep org.apache.karaf.main.Main ${WORKSPACE}/ps_before.log | grep -v grep | tr -s ' ' | cut -f2 -d' ') - echo "karaf main: org.apache.karaf.main.Main, pid:${pid}" - ssh ${!CONTROLLERIP} "${JAVA_HOME}/bin/jstack -l ${pid}" > ${WORKSPACE}/karaf_${i}_${pid}_threads_before.log || true -done +create_controller_variables if [ ${NUM_OPENSTACK_SYSTEM} -gt 0 ]; then echo "Exiting without running tests to deploy openstack for testing"