diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index a62215ea..6af2c7b1 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -170,6 +170,11 @@ function cleanup_host { # Remove duplicate logs rm $WORKSPACE/logs/*.*.txt + # Save the tempest nosetests results + sudo cp $DEST/tempest/nosetests*.xml $WORKSPACE/ + sudo chown jenkins:jenkins $WORKSPACE/nosetests*.xml + sudo chmod a+r $WORKSPACE/nosetests*.xml + # Disable detailed logging as we return to the main script set +o xtrace } diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 8240a3f3..231ef701 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -78,10 +78,10 @@ if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then sudo -H -u stack ./tools/configure_tempest.sh cd $DEST/tempest echo "Running tempest smoke tests" - sudo -H -u stack nosetests --with-xunit -sv --nologcapture --attr=type=smoke tempest + sudo -H -u stack NOSE_XUNIT_FILE=nosetests-smoke.xml nosetests --with-xunit -sv --nologcapture --attr=type=smoke tempest RETVAL=$? if [[ $RETVAL = 0 && "$DEVSTACK_GATE_TEMPEST_FULL" -eq "1" ]]; then echo "Running tempest full test suite" - sudo -H -u stack nosetests --with-xunit -sv --nologcapture --eval-attr='type!=smoke' tempest + sudo -H -u stack NOSE_XUNIT_FILE=nosetests-full.xml nosetests --with-xunit -sv --nologcapture --eval-attr='type!=smoke' tempest fi fi