From 12a5fb3accaf7d3c33aafa5da49be237e16a0368 Mon Sep 17 00:00:00 2001 From: Ronelle Landy Date: Mon, 15 Oct 2018 09:03:06 -0400 Subject: [PATCH] Add tripleo-ha-utils to extra-requirements tripleo-ha-utils tests are running upstream now. The roles need to be included in extras-requirements. Change-Id: Ifa70831fb3a51714e67ddd6bff770c7d4bb33252 --- playbooks/tripleo-ci/templates/toci_gate_test.sh.j2 | 10 ++++++---- toci_gate_test.sh | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/playbooks/tripleo-ci/templates/toci_gate_test.sh.j2 b/playbooks/tripleo-ci/templates/toci_gate_test.sh.j2 index e3443fdd9..c71c02e57 100755 --- a/playbooks/tripleo-ci/templates/toci_gate_test.sh.j2 +++ b/playbooks/tripleo-ci/templates/toci_gate_test.sh.j2 @@ -155,10 +155,12 @@ 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 - starting with browbeat -if [[ -d $TRIPLEO_ROOT/browbeat ]]; then - sed -i "s#git+https://git.openstack.org/openstack/browbeat#file://${TRIPLEO_ROOT}/browbeat#1" ${TRIPLEO_ROOT}/tripleo-quickstart/quickstart-extras-requirements.txt -fi +# Import gated external repo in oooq - starting with browbeat, tripleo-ha-utils +for EXTERNAL_REPO in 'browbeat' 'tripleo-ha-utils'; 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 diff --git a/toci_gate_test.sh b/toci_gate_test.sh index 95acc142d..6193f4715 100755 --- a/toci_gate_test.sh +++ b/toci_gate_test.sh @@ -245,7 +245,7 @@ else fi # Import gated external repo in oooq -for EXTERNAL_REPO in 'browbeat'; do +for EXTERNAL_REPO in 'browbeat' 'tripleo-ha-utils'; 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