#!/bin/bash
# This is temporary, but needed to checki out the needed patches for the new image build role.
# We need it to happen before we get a node from cico so that the correct changes end up in
# the quickstart venv
set -eux

# TODO(trown): Actually merge needed patches for new image building role.
pushd tripleo-quickstart
popd

pushd tripleo-quickstart-extras
git fetch https://git.openstack.org/openstack/tripleo-quickstart-extras refs/changes/36/414336/20 && git checkout FETCH_HEAD
popd

cp $WORKSPACE/tripleo-quickstart/requirements.txt $WORKSPACE/local-requires.txt
echo "file://$WORKSPACE/tripleo-quickstart-extras/#egg=tripleo-quickstart-extras" >> local-requires.txt

bash $WORKSPACE/tripleo-quickstart/quickstart.sh \
    --working-dir $WORKSPACE/.quickstart \
    --no-clone \
    --clean \
    --bootstrap \
    --requirements $WORKSPACE/local-requires.txt \
    --playbook noop.yml \
    localhost


#!/bin/bash
# This is temporary, but needed to checki out the needed patches for the new image build role.
# We need it to happen before we get a node from cico so that the correct changes end up in
# the quickstart venv
set -eux

# TODO(trown): Actually merge needed patches for new image building role.
pushd tripleo-quickstart
git fetch https://git.openstack.org/openstack/tripleo-quickstart refs/changes/19/424319/3 && git checkout FETCH_HEAD
popd

pushd tripleo-quickstart-extras
git fetch https://git.openstack.org/openstack/tripleo-quickstart-extras refs/changes/36/414336/15 && git checkout FETCH_HEAD
popd

cp $WORKSPACE/tripleo-quickstart/requirements.txt $WORKSPACE/local-requires.txt
echo "file://$WORKSPACE/tripleo-quickstart-extras/#egg=tripleo-quickstart-extras" >> local-requires.txt

bash $WORKSPACE/tripleo-quickstart/quickstart.sh \
    --working-dir $WORKSPACE/.quickstart \
    --no-clone \
    --clean \
    --bootstrap \
    --requirements $WORKSPACE/local-requires.txt \
    --playbook noop.yml \
    localhost


--- 
+++ 
@@ -6,10 +6,11 @@
 
 # TODO(trown): Actually merge needed patches for new image building role.
 pushd tripleo-quickstart
+git fetch https://git.openstack.org/openstack/tripleo-quickstart refs/changes/19/424319/3 && git checkout FETCH_HEAD
 popd
 
 pushd tripleo-quickstart-extras
-git fetch https://git.openstack.org/openstack/tripleo-quickstart-extras refs/changes/36/414336/20 && git checkout FETCH_HEAD
+git fetch https://git.openstack.org/openstack/tripleo-quickstart-extras refs/changes/36/414336/15 && git checkout FETCH_HEAD
 popd
 
 cp $WORKSPACE/tripleo-quickstart/requirements.txt $WORKSPACE/local-requires.txt
Update unmerged patch for new image build role

Change-Id: Ied1b1c77d667efc0e9b440452074065c738991ac
