x/browbeat
Code Issues Proposed changes

Merge "More fixes for the CI Pipeline"

Browse Source
This commit is contained in:
Jenkins 2016-12-08 14:32:44 +00:00 committed by Gerrit Code Review
commit d119dd43cb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,15 +16,17 @@ export VARS="elastic_enabled_template=true \
--extra-vars grafana_password_template=$GRAFANA_PASS \ --extra-vars grafana_password_template=$GRAFANA_PASS \
--extra-vars browbeat_cloud_name=$CLOUD_NAME \ --extra-vars browbeat_cloud_name=$CLOUD_NAME \
--extra-vars browbeat_config_file=$BENCHMARK \ --extra-vars browbeat_config_file=$BENCHMARK \
--extra-vars graphite_prefix_template=$CLOUD_NAME \ --extra-vars graphite_prefix_template=$CLOUD_NAME"
--extra-vars dlrn_hash=$current_build"
#For Pipeline builds we need to get the pipeline image #For Pipeline builds we need to get the pipeline image
#we check that the pipeline image var is set and then #we check that the pipeline image var is set and then
#configure it to be used. #configure it to be used.
if [ -z "$current_build" ] if [ ! -z ${current_build+x} ]
then then
export VARS='$VARS --extra-vars undercloud_image_url=$current_build' source $WORKSPACE/tripleo-environments/ci-scripts/internal-functions.sh
hash=$(get_delorean_hash_from_url $current_build)
cached_image="$INTERNAL_IMAGE_SERVER/$RELEASE/delorean/$hash/undercloud.qcow2"
export VARS='$VARS --extra-vars undercloud_image_url=$cached_image --extra-vars dlrn_hash=$hash'
fi fi