From 4c8d41d382bac05a606fa5d52b965119cba77a38 Mon Sep 17 00:00:00 2001 From: vponomaryov Date: Fri, 30 May 2014 19:05:01 +0300 Subject: [PATCH] Fixed config of manila's jobs Script 'contrib/ci/setup.sh' from manila does not exist in place on call moment. Moved call of this file to proper place. Change-Id: I5a3e5352b13f08d9bb5dee6c201d2957b2192d60 --- .../jenkins_job_builder/config/manila.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml index cfb6901abc..ce4aeb42b1 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml @@ -16,12 +16,13 @@ #!/bin/bash -xe export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TIMEOUT=60 - export BASE="/opt/stack" - - # Run setup script with exports of env vars - $BASE/new/manila/contrib/ci/setup.sh + export ENABLED_SERVICES=manila,m-api,m-shr,m-sch,tempest + export PROJECTS="stackforge/manila $PROJECTS" + export PROJECTS="stackforge/python-manilaclient $PROJECTS" function pre_test_hook { + # Run setup script with exports of env vars + $BASE/new/manila/contrib/ci/setup.sh $BASE/new/manila/contrib/ci/pre_test_hook.sh } export -f pre_test_hook @@ -57,12 +58,13 @@ #!/bin/bash -xe export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TIMEOUT=60 - export BASE="/opt/stack" - - # Run setup script with exports of env vars - $BASE/new/manila/contrib/ci/multi_backend/setup.sh + export ENABLED_SERVICES=manila,m-api,m-shr,m-sch,tempest + export PROJECTS="stackforge/manila $PROJECTS" + export PROJECTS="stackforge/python-manilaclient $PROJECTS" function pre_test_hook { + # Run setup script with exports of env vars + $BASE/new/manila/contrib/ci/multi_backend/setup.sh $BASE/new/manila/contrib/ci/multi_backend/pre_test_hook.sh } export -f pre_test_hook