Add in branch case for puppet-ceph stable/jewel
Since puppet-ceph does not follow the openstack naming conventions, we need to add a special case so we get the right version of puppet-openstack-integration checked out. Until we can switch over to the zuul v3 layout that has this in it as well, we need to update the legacy job to handle a stable/jewel to stable/pike change Change-Id: I1cf54bec08dd3253c394473daa34c125af67b410
This commit is contained in:
parent
974d7793d2
commit
174ecf5047
@ -11,6 +11,14 @@
|
|||||||
cmd: |
|
cmd: |
|
||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
|
ZUUL_BRANCH_REAL=${ZUUL_BRANCH:-master}
|
||||||
|
# Workaround for puppet-ceph, where we need to checkout
|
||||||
|
# puppet-openstack-integration from stable/pike when working on
|
||||||
|
# stable/jewel.
|
||||||
|
# Ceph Jewel works with Newton to Pike
|
||||||
|
if [[ "$ZUUL_BRANCH" == "stable/jewel" ]]; then
|
||||||
|
ZUUL_BRANCH_REAL='stable/pike'
|
||||||
|
fi
|
||||||
CLONEMAP=`mktemp`
|
CLONEMAP=`mktemp`
|
||||||
function cleanup {
|
function cleanup {
|
||||||
# In cases where zuul-cloner is aborted during a git
|
# In cases where zuul-cloner is aborted during a git
|
||||||
@ -30,7 +38,9 @@
|
|||||||
- name: $ZUUL_PROJECT
|
- name: $ZUUL_PROJECT
|
||||||
dest: .
|
dest: .
|
||||||
EOF
|
EOF
|
||||||
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
|
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP \
|
||||||
|
--cache-dir /opt/git \
|
||||||
|
--zuul-branch $ZUUL_BRANCH_REAL \
|
||||||
git://git.openstack.org $ZUUL_PROJECT
|
git://git.openstack.org $ZUUL_PROJECT
|
||||||
executable: /bin/bash
|
executable: /bin/bash
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
chdir: '{{ ansible_user_dir }}/workspace'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user