From fc889a588ba85bf89fa7aa23f7282efa83aad852 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 6 Jul 2017 09:50:41 -0700
Subject: [PATCH] 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
---
 jenkins/jobs/puppet-module-jobs.yaml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/jenkins/jobs/puppet-module-jobs.yaml b/jenkins/jobs/puppet-module-jobs.yaml
index ef68932691..c166920283 100644
--- a/jenkins/jobs/puppet-module-jobs.yaml
+++ b/jenkins/jobs/puppet-module-jobs.yaml
@@ -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: