From 8e3afe378c93d1bbc54e701d325d22fccb05edf7 Mon Sep 17 00:00:00 2001 From: jkilpatr Date: Tue, 3 Jan 2017 12:44:21 +0000 Subject: [PATCH] Moving oooq pinned commits downstream for easier upkeep Just moves a few lines from the JJB to here. I remember thinking this wouldn't work for some reason, but now I can't remember why and a quick test shows no problems. So here we go anyways. Change-Id: I6e7ea058629234d63edadbd715d0cd762f6ccc04 --- ci-scripts/tripleo/microbrow.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ci-scripts/tripleo/microbrow.sh b/ci-scripts/tripleo/microbrow.sh index 175756af1..05eadac17 100755 --- a/ci-scripts/tripleo/microbrow.sh +++ b/ci-scripts/tripleo/microbrow.sh @@ -1,8 +1,19 @@ #!/bin/bash set -eu +pushd $WORKSPACE + git clone https://github.com/openstack/tripleo-quickstart-extras + pushd $WORKSPACE/tripleo-quickstart-extras + git fetch git://git.openstack.org/openstack/tripleo-quickstart-extras refs/changes/77/403677/9 && git checkout FETCH_HEAD + popd +popd + +pushd $WORKSPACE/tripleo-quickstart + sed -i.bak '/extras/d' $WORKSPACE/tripleo-quickstart/quickstart-extras-requirements.txt + echo "file://$WORKSPACE/tripleo-quickstart-extras/#egg=tripleo-quickstart-extras" >> $WORKSPACE/tripleo-quickstart/quickstart-extras-requirements.txt +popd + export OPT_DEBUG_ANSIBLE=0 -export USER=root export HW_ENV_DIR=$WORKSPACE/tripleo-environments/hardware_environments/$HW_ENV export NETWORK_ISOLATION=no_vlan export REQS=quickstart-extras-requirements.txt