Use tox instead of run_tempest.sh

Following up on a discussion with tempest cores, upstream gate jobs
typically use tox to run tempest, not run_tempest.sh.
Their behaviors are slightly different so let's just align with the
remainder of the jobs.

Change-Id: I3f77a23bc4aa1a6450e8e661a4536274b02d5dc2
This commit is contained in:
David Moreau Simard 2016-03-01 11:18:55 -05:00
parent a08b78d6fd
commit 1073939eed
2 changed files with 6 additions and 4 deletions

View File

@ -52,9 +52,11 @@ def initSequences(controller):
# -------------------------- step functions --------------------------
def run_tempest(config, messages):
logfile = basedefs.DIR_LOG + "/run_tempest.log"
logfile = basedefs.DIR_LOG + "/tempest.log"
print("Running Tempest on %s" % config['CONFIG_TEMPEST_HOST'])
server = utils.ScriptRunner(config['CONFIG_TEMPEST_HOST'])
server.append('/var/lib/tempest/run_tempest.sh -V %s > %s'
server.append('pushd /var/lib/tempest')
server.append('tox -eall -- --concurrency=2 %s > %s'
% (config['CONFIG_RUN_TEMPEST_TESTS'], logfile))
server.append('popd')
server.execute()

View File

@ -118,8 +118,8 @@ result=$?
# Print output and generate subunit if results exist
if [ -d /var/lib/tempest ]; then
pushd /var/lib/tempest
$SUDO /var/lib/tempest/.venv/bin/testr last || true
$SUDO bash -c "/var/lib/tempest/.venv/bin/testr last --subunit > /var/tmp/packstack/latest/testrepository.subunit" || true
$SUDO .tox/all/bin/testr last || true
$SUDO bash -c ".tox/all/bin/testr last --subunit > /var/tmp/packstack/latest/testrepository.subunit" || true
popd
fi