x
/
browbeat
Code Issues Proposed changes

Merge "Updating promotion pipeline logic for oooq"

This commit is contained in:
Zuul 2017-10-24 20:17:44 +00:00 committed by Gerrit Code Review
parent 4cd0fcac88 b887a03940
commit a40102a9cd
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ansible/oooq/roles/pre-install-setup/tasks/main.yml
View File

@ -18,7 +18,4 @@
flat=yes"
- name: Load Browbeat vars
include_vars: /tmp/all.yml
- name: Load CI vars
include_vars: "{{ lookup('env','HW_ENV_DIR') }}/all.yml"
include_vars: /tmp/all.yml

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

@ -44,14 +44,14 @@ if [ ! -z ${current_build+x} ]
then
source $WORKSPACE/tripleo-environments/ci-scripts/internal-functions.sh
hash=$(get_delorean_hash_from_url $current_build)
expanded_hash=$(get_expanded_delorean_hash_from_url $current_build)
export VARS="$VARS --extra-vars current_build=$hash"
if [[ $RELEASE == *rhos-* ]]
then
cached_image="$INTERNAL_IMAGE_SERVER/$RELEASE/$current_build/undercloud.qcow2"
export VARS="$VARS --extra-vars undercloud_image_url=$cached_image --extra-vars rhos_puddle=$current_build"
export RELEASE="$RELEASE" #no mutations needed after latest changes
else
cached_image="$INTERNAL_IMAGE_SERVER/centos-org-image-cache/$RELEASE/rdo_trunk/$hash/undercloud.qcow2"
export VARS="$VARS --extra-vars undercloud_image_url=$cached_image --extra-vars dlrn_hash=$hash"
export RELEASE="$RELEASE-rhel"
fi
#If we are not in the pipeline downstream builds need to use current-passed-ci
@ -85,5 +85,6 @@ echo "file://$WORKSPACE/browbeat/#egg=browbeat" >> $REQS
-R $RELEASE \
--config $HW_ENV_DIR/network_configs/$NETWORK_ISOLATION/config_files/config.yml \
--extra-vars @$HW_ENV_DIR/network_configs/$NETWORK_ISOLATION/env_settings.yml \
--extra-vars @$HW_ENV_DIR/all.yml \
--extra-vars $VARS \
$VIRTHOST