puppet: remove workaround for mitaka/hammer branches

stable/hammer & stable/mitaka have been EOLed so we don't need these
workarounds anymore in JJB.

Change-Id: I9a9f89f9b7fb2366bb22cf24db3a659d4f6d4dcc
This commit is contained in:
Emilien Macchi 2017-07-06 09:50:41 -07:00
parent 08c5e1685e
commit fc889a588b

View File

@ -3,14 +3,6 @@
builders:
- shell: |
#!/bin/bash -xe
ZUUL_BRANCH_REAL=${ZUUL_BRANCH:-master}
# Workaround for puppet-ceph, where we need to checkout
# puppet-openstack-integration from stable/mitaka when working on stable/hammer.
# Ceph Hammer works with Mitaka and before.
# Ceph Jewel works with Newton and beyond.
if [[ "$ZUUL_BRANCH" == "stable/hammer" ]]; then
ZUUL_BRANCH_REAL='stable/mitaka'
fi
export ZUUL_REF=${ZUUL_REF:-None}
CLONEMAP=`mktemp`
function cleanup {
@ -24,7 +16,6 @@
EOF
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP \
--cache-dir /opt/git \
--zuul-branch $ZUUL_BRANCH_REAL \
git://git.openstack.org openstack/puppet-openstack-integration
- job-template: