Remove configurable testr artifact processing

The use case of being able to have functional jobs reuse testr
artifact processing is instead being targeted by a refactored version
of project-config's run-tox.sh script.

Change-Id: I58d33f1e9b2cb7eed6931d615a2ef340cf53ed19
Depends-On: Ib932423bbeec76ae49b93e28e9fc693d7ee57bed
This commit is contained in:
Maru Newby
2015-03-04 21:08:16 +00:00
parent 07ede2fa30
commit 11cf5a8d47
2 changed files with 2 additions and 11 deletions

View File

@@ -232,10 +232,6 @@ export DEVSTACK_GATE_KEYSTONE_V3=${DEVSTACK_GATE_KEYSTONE_V3:-0}
# Set to 1 to enable installing test requirements
export DEVSTACK_GATE_INSTALL_TESTONLY=${DEVSTACK_GATE_INSTALL_TESTONLY:-0}
# Set to the name of the project (e.g. 'neutron') whose testr
# artifacts should be processed on cleanup.
export DEVSTACK_GATE_TESTR_ARTIFACT_TARGET=${DEVSTACK_GATE_TESTR_ARTIFACT_TARGET:-tempest}
# Set to 0 to run services that default under Apache + mod_wsgi under alternatives (e.g. eventlet)
# if possible
export DEVSTACK_GATE_ENABLE_HTTPD_MOD_WSGI_SERVICES=${DEVSTACK_GATE_ENABLE_HTTPD_MOD_WSGI_SERVICES:-1}

View File

@@ -544,8 +544,6 @@ function cleanup_host {
local xtrace=$(set +o | grep xtrace)
set -o xtrace
local testr_target=$DEVSTACK_GATE_TESTR_ARTIFACT_TARGET
cd $WORKSPACE
# Sleep to give services a chance to flush their log buffers.
@@ -698,11 +696,8 @@ function cleanup_host {
sudo mv $WORKSPACE/rpm-qa.txt.gz $BASE/logs/
fi
process_testr_artifacts $testr_target
if [[ "$testr_target" == "tempest" ]]; then
# Attempt to process artifacts from the old grenade path
process_testr_artifacts $testr_target old
fi
process_testr_artifacts tempest
process_testr_artifacts tempest old
if [ -f $BASE/new/tempest/tempest.log ] ; then
sudo cp $BASE/new/tempest/tempest.log $BASE/logs/tempest.log