diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index b9f1ee7d..0bbf9ca1 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -375,10 +375,6 @@ function cleanup_host { sudo cp $BASE/new/tempest/nosetests*.xml $WORKSPACE/ sudo chown jenkins:jenkins $WORKSPACE/nosetests*.xml sudo chmod a+r $WORKSPACE/nosetests*.xml - if [ $DEVSTACK_GATE_TEMPEST_COVERAGE -eq "1" ] ; then - sudo mkdir $WORKSPACE/logs/coverage-report/ - sudo cp $BASE/new/tempest/coverage-report/* $WORKSPACE/logs/coverage-report/ - fi # Disable detailed logging as we return to the main script set +o xtrace @@ -454,9 +450,6 @@ export DEVSTACK_GATE_POSTGRES=${DEVSTACK_GATE_POSTGRES:-0} # Set to 1 to use zeromq instead of rabbitmq (or qpid) export DEVSTACK_GATE_ZEROMQ=${DEVSTACK_GATE_ZEROMQ:-0} -# Set to 1 to run nova coverage with Tempest -export DEVSTACK_GATE_TEMPEST_COVERAGE=${DEVSTACK_GATE_TEMPEST_COVERAGE:-0} - # Set to 1 to run tempest stress tests export DEVSTACK_GATE_TEMPEST_STRESS=${DEVSTACK_GATE_TEMPEST_STRESS:-0} diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index bf6bb855..6e48b8d4 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -133,10 +133,6 @@ EOF echo "HEAT_CREATE_TEST_IMAGE=True" >>localrc fi - if [ "$DEVSTACK_GATE_TEMPEST_COVERAGE" -eq "1" ] ; then - echo "EXTRA_OPTS=(backdoor_port=0)" >>localrc - fi - if [ "$DEVSTACK_GATE_POSTGRES" -eq "1" ]; then cat <<\EOF >>localrc disable_service mysql @@ -303,10 +299,6 @@ if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then echo "Running tempest full test suite with testr" sudo -H -u tempest tox -etestr-full res=$? - elif [[ "$DEVSTACK_GATE_TEMPEST_COVERAGE" -eq "1" ]] ; then - echo "Generating coverage report" - sudo -H -u tempest tox -ecoverage -- -o $BASE/new/tempest/coverage-report - res=$? elif [[ "$DEVSTACK_GATE_TEMPEST_STRESS" -eq "1" ]] ; then echo "Running stress tests" sudo -H -u tempest tox -estress