From 13084694be6299a4ace1e62eea4d61f5cee3afb4 Mon Sep 17 00:00:00 2001 From: Maru Newby Date: Wed, 2 Jul 2014 00:43:08 +0000 Subject: [PATCH] Fix neutron func job to use gate-specific tox env The neutron tox config now has a gate-specific tox env (tox -e dsvm-functional) that configures the environment variables necessary to run tests that require the use of sudo+rootwrap. Change-Id: I25b50e3c0ddb8714387e0e3902c237a0a41a3443 Closes-bug: #1336172 --- .../jenkins_job_builder/config/neutron-functional.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/neutron-functional.yaml b/modules/openstack_project/files/jenkins_job_builder/config/neutron-functional.yaml index 2b3be6d765..5a4fa101f4 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/neutron-functional.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/neutron-functional.yaml @@ -26,14 +26,11 @@ function post_test_hook {{ $BASE/new/devstack/unstack.sh - # TODO(HenryG): this isn't actually passed through sudo - export OS_SUDO_TESTING=1 cd $BASE/new/neutron - # Run tests as the stack user to allow sudo. + # Run tests as the stack user to allow sudo+rootwrap. sudo chown -R stack:stack $BASE/new/neutron - echo 'Defaults:stack !requiretty' | sudo tee /etc/sudoers.d/00_no_tty echo "Running neutron functional test suite" - sudo -H -u stack tox -e functional + sudo -H -u stack tox -e dsvm-functional }} export -f post_test_hook cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh