From ec47cd4dc02d729f38ddc6930768e810bb490d2b Mon Sep 17 00:00:00 2001 From: Wes Hayutin Date: Thu, 20 Dec 2018 15:36:38 -0700 Subject: [PATCH] update toci_gate_test for no tebroker Remove options to run w/ te-broker Change-Id: Iefefe74355a4621c221806b69dbc5cf7bef29397 --- toci_gate_test.sh | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/toci_gate_test.sh b/toci_gate_test.sh index 525e8336c..2b6ed1898 100755 --- a/toci_gate_test.sh +++ b/toci_gate_test.sh @@ -266,23 +266,7 @@ done # Start time tracking export STATS_TESTENV=$(date +%s) pushd $TRIPLEO_ROOT/tripleo-ci -if [ ! -e $WORKSPACE/instackenv.json -a "$ENVIRONMENT" = "ovb" ] ; then - echo "Running with te-broker" - export GEARDSERVER=${TEBROKERIP-192.168.1.1} - # NOTE(pabelanger): We need gear for testenv, but this really should be - # handled by tox. - sudo pip install gear - # Kill the whole job if it doesn't get a testenv in 20 minutes as it likely will timout in zuul - ( sleep 1200 ; [ ! -e /tmp/toci.started ] && sudo kill -9 $$ ) & - - # We only support multi-nic at the moment - NETISO_ENV="multi-nic" - - # provision env in rh cloud, then start quickstart - ./testenv-client -b $GEARDSERVER:4730 -t $TIMEOUT_SECS \ - --envsize $NODECOUNT --ucinstance $UCINSTANCEID \ - --net-iso $NETISO_ENV $EXTRANODE -- ./toci_quickstart.sh -elif [ -e $WORKSPACE/instackenv.json -a "$ENVIRONMENT" = "ovb" ] ; then +if [ -e $WORKSPACE/instackenv.json -a "$ENVIRONMENT" = "ovb" ] ; then echo "Running without te-broker" export TE_DATAFILE=$WORKSPACE/instackenv.json ./toci_quickstart.sh