X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-deploy-controller-run-test.sh;h=5053957a31ba8bdb88970031fdb9172f4afb3663;hb=cf6c5f7e555706120868b563a811465261010c51;hp=baae769d8d977cc143397103db6951a0e68b5945;hpb=17e405080849c714581eaeb98ad4b20dae1f3ea9;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 baae769d8..5053957a3 100755 --- a/jjb/integration/integration-deploy-controller-run-test.sh +++ b/jjb/integration/integration-deploy-controller-run-test.sh @@ -1,5 +1,10 @@ #!/bin/bash #@IgnoreInspection BashAddShebang + +if [ "${IS_KARAF_APPL}" = "False" ] ; then + echo "Not a Karaf Distro skipping karaf deployment" + exit +fi # Activate robotframework virtualenv # ${ROBOT_VENV} comes from the integration-install-robotframework.sh # script. @@ -7,6 +12,7 @@ source "${ROBOT_VENV}/bin/activate" source /tmp/common-functions.sh "${BUNDLEFOLDER}" + echo "#################################################" echo "## Configure Cluster and Start ##" echo "#################################################" @@ -83,6 +89,7 @@ robot -N "${TESTPLAN}" \ -v TOOLS_SYSTEM_IP:"${TOOLS_SYSTEM_IP}" ${tools_variables} \ -v TOOLS_SYSTEM_USER:"${USER}" \ -v USER_HOME:"${HOME}" \ + -v IS_KARAF_APPL:"${IS_KARAF_APPL}" \ -v WORKSPACE:/tmp \ ${TESTOPTIONS} ${SUITES} || true