openstack
/
murano-deployment
Code Issues Proposed changes

Fix murano-agent image building 

In heartbeat jobs for murano-agent where
ZUUL_PROJECT variable is by default set
to openstack/murano we need properly set DIB_MURANO_AGENT_REPO
and fix make_img_with_murano_agent function

Change-Id: Icc3e962621e95f13f27ac68ba7aef430966fe585
Closes-Bug: #1635793
This commit is contained in:
Mykyta Karpin 2016-10-22 10:50:42 +03:00
parent 8154507473
commit c70dba8a45
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
murano-ci/scripts/common.inc
View File

@ -116,7 +116,7 @@ case "${PROJECT_NAME}" in
;;
'murano-agent')
PROJECT_TESTS_DIR="${STACK_HOME}/murano/murano/tests/functional"
export DIB_MURANO_AGENT_REPO="${ZUUL_URL}/${ZUUL_PROJECT}"
export DIB_MURANO_AGENT_REPO="${ZUUL_URL}/${PROJECT_NAME_REAL}"
export DIB_MURANO_AGENT_BRANCH=${ZUUL_BRANCH}
export DIB_MURANO_AGENT_REF=${ZUUL_REF}
;;

4
murano-ci/scripts/prepare_tests.sh
View File

@ -80,10 +80,10 @@ function make_img_with_murano_agent() {
sudo chmod 777 "${agent_dir}"
sudo pip install diskimage-builder
git clone "${ZUUL_URL}/${ZUUL_PROJECT}" "${agent_dir}/murano-agent"
git clone "${DIB_MURANO_AGENT_REPO}" "${agent_dir}/murano-agent"
pushd "${agent_dir}/murano-agent"
git fetch "${ZUUL_URL}/${ZUUL_PROJECT}" "${ZUUL_REF}" && git checkout FETCH_HEAD
git fetch "${DIB_MURANO_AGENT_REPO}" "${DIB_MURANO_AGENT_REF}" && git checkout FETCH_HEAD
popd
mkdir -p "${agent_dir}/elements"