x/browbeat
Code Issues Proposed changes

Less verbose logging, fixing namespacing issues

Browse Source 
Change-Id: I6858cd702cb9cf8881d7a4659aacbba463cbcf11
This commit is contained in:
jkilpatr 2016-12-09 13:07:15 +00:00
parent 4be103b8b9
commit a0d7fe8a4f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,13 @@
#!/bin/bash #!/bin/bash
set -eu set -eu
OPT_DEBUG_ANSIBLE=1 export OPT_DEBUG_ANSIBLE=0
USER=root export USER=root
HW_ENV_DIR=$WORKSPACE/tripleo-environments/hardware_environments/$HW_ENV export HW_ENV_DIR=$WORKSPACE/tripleo-environments/hardware_environments/$HW_ENV
NETWORK_ISOLATION=no_vlan export NETWORK_ISOLATION=no_vlan
REQS=quickstart-extras-requirements.txt export REQS=quickstart-extras-requirements.txt
PLAYBOOK=baremetal-virt-undercloud-tripleo-browbeat.yml export PLAYBOOK=baremetal-virt-undercloud-tripleo-browbeat.yml
VARS="elastic_enabled_template=true \ export VARS="elastic_enabled_template=true \
--extra-vars graphite_enabled_template=true \ --extra-vars graphite_enabled_template=true \
--extra-vars elastic_host_template=$ELASTIC_HOST \ --extra-vars elastic_host_template=$ELASTIC_HOST \
--extra-vars graphite_host_template=$GRAPH_HOST \ --extra-vars graphite_host_template=$GRAPH_HOST \
@ -26,12 +26,12 @@ if [ ! -z ${current_build+x} ]
source $WORKSPACE/tripleo-environments/ci-scripts/internal-functions.sh source $WORKSPACE/tripleo-environments/ci-scripts/internal-functions.sh
hash=$(get_delorean_hash_from_url $current_build) hash=$(get_delorean_hash_from_url $current_build)
cached_image="$INTERNAL_IMAGE_SERVER/$RELEASE/delorean/$hash/undercloud.qcow2" cached_image="$INTERNAL_IMAGE_SERVER/$RELEASE/delorean/$hash/undercloud.qcow2"
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
elif [[ $RELEASE == *rhos-* ]] elif [[ $RELEASE == *rhos-* ]]
then then
RELEASE="$RELEASE-current-passed-ci" export RELEASE="$RELEASE-current-passed-ci"
fi fi