x/browbeat
Code Issues Proposed changes

New url structure for for rhos pipelines in CI

Browse Source 
This updates the url building for the rhos pipeline builds
so that we grab the correct image ID when the promotion pipeline
attempts to promote a build.

Change-Id: I13da83b7ecdf4cd145e7ffc1ae2b9e6e0a9690f1
This commit is contained in:
jkilpatr 2017-04-04 16:01:40 -04:00 committed by Justin Kilpatrick
parent 19d73c20ae
commit 74d25875e1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ci-scripts/tripleo/microbrow.sh
View File

@ -4,7 +4,7 @@ set -eu
pushd $WORKSPACE pushd $WORKSPACE
pushd $WORKSPACE/tripleo-quickstart-extras pushd $WORKSPACE/tripleo-quickstart-extras
git fetch git://git.openstack.org/openstack/tripleo-quickstart-extras refs/changes/46/437946/1 && git checkout FETCH_HEAD git fetch git://git.openstack.org/openstack/tripleo-quickstart-extras refs/changes/46/437946/4 && git checkout FETCH_HEAD
set +eu set +eu
source $WORKSPACE/bin/activate source $WORKSPACE/bin/activate
pip uninstall -y tripleo-quickstart-extras pip uninstall -y tripleo-quickstart-extras
@ -47,11 +47,15 @@ if [ ! -z ${current_build+x} ]
#Ocata pipeling moving to new folder structure #Ocata pipeling moving to new folder structure
if [[ $RELEASE == *ocata* ]] if [[ $RELEASE == *ocata* ]]
then then
cached_image="$INTERNAL_IMAGE_SERVER/$RELEASE/rdo_trunk/$hash/undercloud.qcow2" cached_image="$INTERNAL_IMAGE_SERVER/centos-org-image-cache/$RELEASE/rdo_trunk/$hash/undercloud.qcow2"
else else
cached_image="$INTERNAL_IMAGE_SERVER/$RELEASE/delorean/$hash/undercloud.qcow2" cached_image="$INTERNAL_IMAGE_SERVER/centos-org-image-cache/$RELEASE/delorean/$hash/undercloud.qcow2"
fi fi
if [[ $RELEASE == *rhos-* ]]
then
cached_image="$INTERNAL_IMAGE_SERVER/$RELEASE/$hash/undercloud.qcow2"
fi
export VARS="$VARS --extra-vars undercloud_image_url=$cached_image --extra-vars dlrn_hash=$hash" export VARS="$VARS --extra-vars undercloud_image_url=$cached_image --extra-vars dlrn_hash=$hash"
#If we are not in the pipeline downstream builds need to use current-passed-ci #If we are not in the pipeline downstream builds need to use current-passed-ci