Remove nosetests.xml reference
We do not expect nosetests.xml anywhere, so there is no need for an else clause that creates one and the copying of nosetests logs. Change-Id: Id5b96f00d66de46372148e268330ee04f04770ae
This commit is contained in:
parent
3875417fd9
commit
e4bced77cb
|
@ -11,7 +11,6 @@ covhtml
|
||||||
AUTHORS
|
AUTHORS
|
||||||
ChangeLog
|
ChangeLog
|
||||||
pep8.txt
|
pep8.txt
|
||||||
nosetests.xml
|
|
||||||
*.db
|
*.db
|
||||||
.DS_Store
|
.DS_Store
|
||||||
build/
|
build/
|
||||||
|
|
|
@ -440,11 +440,4 @@ if [[ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]]; then
|
||||||
sudo -H -u tempest tox -esmoke -- --concurrency=$TEMPEST_CONCURRENCY
|
sudo -H -u tempest tox -esmoke -- --concurrency=$TEMPEST_CONCURRENCY
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
|
||||||
# Jenkins expects at least one nosetests file. If we're not running
|
|
||||||
# tempest, then write a fake one that indicates the tests pass (since
|
|
||||||
# we made it past exercise.sh.
|
|
||||||
cat > $WORKSPACE/nosetests-fake.xml <<EOF
|
|
||||||
<?xml version="1.0" encoding="UTF-8"?><testsuite name="nosetests" tests="0" errors="0" failures="0" skip="0"></testsuite>
|
|
||||||
EOF
|
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -708,11 +708,6 @@ function cleanup_host {
|
||||||
sudo find $BASE/logs -iname '*.dat' -execdir gzip -9 {} \+
|
sudo find $BASE/logs -iname '*.dat' -execdir gzip -9 {} \+
|
||||||
sudo find $BASE/logs -iname '*.conf' -execdir gzip -9 {} \+
|
sudo find $BASE/logs -iname '*.conf' -execdir gzip -9 {} \+
|
||||||
|
|
||||||
# Save the tempest nosetests results
|
|
||||||
sudo cp $BASE/new/tempest/nosetests*.xml $BASE/logs/
|
|
||||||
sudo chown jenkins:jenkins $BASE/logs/nosetests*.xml
|
|
||||||
sudo chmod a+r $BASE/logs/nosetests*.xml
|
|
||||||
|
|
||||||
# Disable detailed logging as we return to the main script
|
# Disable detailed logging as we return to the main script
|
||||||
$xtrace
|
$xtrace
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue