From ed70735ac622d95f93abe04a55778eec2a1498f8 Mon Sep 17 00:00:00 2001
From: Sergey Skripnick <sskripnick@mirantis.com>
Date: Fri, 18 Apr 2014 23:19:17 +0300
Subject: [PATCH] Run rally ./exercise.sh inside post_test_hook
Since ./exercise.sh is run via sudo -H, environment variables
are not available for exercises/rally.sh. Some variables are
needed to be preserved, so we run ./exercise.sh in post_test_hook
without sudo.
Change-Id: I4c147219037d9358e8abda32f2dca7bde5706f83
---
.../files/jenkins_job_builder/config/rally.yaml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
index 796331ab34..0a988f2091 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
@@ -20,8 +20,7 @@
#!/bin/bash -xe
export PROJECTS="stackforge/rally $PROJECTS"
export ENABLED_SERVICES=rally
- export DEVSTACK_GATE_EXERCISES=1
- export RUN_EXERCISES=rally
+ export DEVSTACK_GATE_EXERCISES=0
export RALLY_SCENARIO={scenario}
function pre_test_hook {{
@@ -30,6 +29,11 @@
}}
export -f pre_test_hook
+ function post_test_hook {{
+ $BASE/new/rally/tests_ci/rally-gate.sh
+ }}
+ export -f post_test_hook
+
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh