Merge "Fix pre_test_hook in rally-scenarios-job"

2014-04-16 14:49:28 +00:00 · 2014-04-16 14:49:28 +00:00 · 3ca3786c21
commit 3ca3786c21
parent 5e0076532f d503d0e2f2
2 changed files with 2 additions and 2 deletions
--- 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

--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@ -536,7 +536,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