diff --git a/.gitignore b/.gitignore index 5c1baa98..c988a230 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,6 @@ covhtml AUTHORS ChangeLog pep8.txt -nosetests.xml *.db .DS_Store build/ diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 01c636df..e9879d0b 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -539,11 +539,4 @@ if [[ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]]; then sudo -H -u tempest tox -esmoke -- --concurrency=$TEMPEST_CONCURRENCY 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 fi diff --git a/functions.sh b/functions.sh index cb9b6e84..93478c07 100644 --- a/functions.sh +++ b/functions.sh @@ -710,11 +710,6 @@ function cleanup_host { sudo find $BASE/logs -iname '*.dat' -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 $xtrace }