Merge "Add Browbeat env settings to rdocloud"
This commit is contained in:
commit
ca3e4a78fb
|
@ -41,6 +41,7 @@ artcl_collect_list:
|
|||
- /home/{{ undercloud_user }}/tripleo-config/
|
||||
- /home/{{ undercloud_user }}/undercloud-ansible-*/
|
||||
- /home/{{ undercloud_user }}/undercloud-install-*
|
||||
- /home/{{ undercloud_user }}/browbeat/log/*
|
||||
- /tmp/ansible-mistral-action*/
|
||||
- /etc/ansible/
|
||||
- /etc/aodh/
|
||||
|
|
|
@ -49,3 +49,8 @@ influxdb_password:
|
|||
influxdb_dbname: tripleo_ci
|
||||
influxdb_data_file_path: "{{ artcl_collect_dir }}/influxdb_data"
|
||||
influxdb_create_data_file: true
|
||||
|
||||
# Browbeat settings
|
||||
cloud_name: rdocloud
|
||||
elastic_host: browbeat.test.com
|
||||
grafana_host: browbeat.test.com
|
||||
|
|
|
@ -129,7 +129,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
|||
if [[ " $QUICKSTART_SH_JOBS " =~ " $TOCI_JOBTYPE " ]]; then
|
||||
export PLAYBOOKS=${PLAYBOOKS:-"baremetal-full-deploy.yml"}
|
||||
else
|
||||
export PLAYBOOKS=${PLAYBOOKS:-"ovb-setup.yml baremetal-full-undercloud.yml baremetal-full-overcloud-prep.yml baremetal-full-overcloud.yml baremetal-full-overcloud-validate.yml"}
|
||||
export PLAYBOOKS=${PLAYBOOKS:-"ovb-setup.yml baremetal-full-undercloud.yml baremetal-full-overcloud-prep.yml baremetal-full-overcloud.yml baremetal-full-overcloud-validate.yml browbeat-minimal.yml"}
|
||||
fi
|
||||
ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb.yml"
|
||||
if [[ -f "$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb-$RHCLOUD.yml" ]]; then
|
||||
|
@ -231,6 +231,13 @@ else
|
|||
echo "git+https://git.openstack.org/openstack/tripleo-upgrade.git@${ZUUL_BRANCH}#egg=tripleo-upgrade" >> ${TRIPLEO_ROOT}/tripleo-quickstart/quickstart-extras-requirements.txt
|
||||
fi
|
||||
|
||||
# Import gated external repo in oooq
|
||||
for EXTERNAL_REPO in 'browbeat'; do
|
||||
if [[ -d $TRIPLEO_ROOT/$EXTERNAL_REPO ]]; then
|
||||
sed -i "s#git+https://git.openstack.org/openstack/$EXTERNAL_REPO#file://${TRIPLEO_ROOT}/$EXTERNAL_REPO#1" ${TRIPLEO_ROOT}/tripleo-quickstart/quickstart-extras-requirements.txt
|
||||
fi
|
||||
done
|
||||
|
||||
# Start time tracking
|
||||
export STATS_TESTENV=$(date +%s)
|
||||
pushd $TRIPLEO_ROOT/tripleo-ci
|
||||
|
|
Loading…
Reference in New Issue