From e4bced77cb294a2e3b7d844814e8bf19af7b0536 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 29 Oct 2014 12:45:29 +0100
Subject: [PATCH] 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
---
 .gitignore          | 1 -
 devstack-vm-gate.sh | 7 -------
 functions.sh        | 5 -----
 3 files changed, 13 deletions(-)

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 f22d6882..a15ad156 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -440,11 +440,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
-<?xml version="1.0" encoding="UTF-8"?><testsuite name="nosetests" tests="0" errors="0" failures="0" skip="0"></testsuite>
-EOF
 fi
diff --git a/functions.sh b/functions.sh
index 70e766eb..4c425b4b 100644
--- a/functions.sh
+++ b/functions.sh
@@ -708,11 +708,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
 }