From d503d0e2f2776e3eefe33c32707423f0d91f8cf8 Mon Sep 17 00:00:00 2001 From: Sergey Skripnick Date: Wed, 9 Apr 2014 11:20:09 +0300 Subject: [PATCH] Fix pre_test_hook in rally-scenarios-job pre_test_hook.sh should be run in the current shell context. This is mandatory because we need to export some environment variables. Also fixed `voting` line for this job. Change-Id: I49632bd323ad7abdcfaff5d8295a4557fa8e34ec --- .../files/jenkins_job_builder/config/rally.yaml | 2 +- modules/openstack_project/files/zuul/layout.yaml | 2 +- 2 files changed, 2 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 e1b0212aca..24c8841810 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml @@ -22,7 +22,7 @@ export PROJECTS="stackforge/rally $PROJECTS" function pre_test_hook {{ - /opt/stack/new/rally/tests_ci/pre_test_hook.sh + . /opt/stack/new/rally/tests_ci/pre_test_hook.sh }} export -f pre_test_hook diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 2c54927cb6..973dbbbe76 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -549,7 +549,7 @@ jobs: voting: false - name: ^check-rally-install-.*$ voting: false - - name: ^check-rally-scenarios-.*$ + - name: check-rally-scenarios voting: false - name: gate-rally-python33 voting: false