Fix requirements checkout on buildimage
The current zuul-git-prep-upper-constraints macro
was giving conflict with the pre-existing checkout one. As
both do the clone of the checked project, it was giving
an error on git, because the directory already existed.
Adding openstack/requirements to the clonemap instead
openstack/instack-undercloud \
openstack/python-tripleoclient \
openstack/tripleo-image-elements \
- openstack/tripleo-puppet-elements
+ openstack/tripleo-puppet-elements \
+ openstack/requirements
- job-template:
name: '{pipeline}-tripleo-quickstart-{scenario}-{node}{suffix}'
- link-logs
- net-info
- python-tripleoclient-buildimage-checkout
- - zuul-git-prep-upper-constraints
- shell: |
#!/bin/bash -xe
cd python-tripleoclient
if [ "$ZUUL_BRANCH" == "master" ]; then
tox -evenv -- pip install $WORKSPACE/diskimage-builder
else
- export UPPER_CONSTRAINTS_FILE=$WORKSPACE/upper-constraints.txt
+ export UPPER_CONSTRAINTS_FILE=$WORKSPACE/requirements/upper-constraints.txt
tox -evenv -- pip install diskimage-builder -c $UPPER_CONSTRAINTS_FILE
fi
