From 38fcbdc779e054ed314b40ddeeee735accb08103 Mon Sep 17 00:00:00 2001
From: Luca Miccini <lmiccini@redhat.com>
Date: Tue, 6 Dec 2022 15:53:08 +0100
Subject: [PATCH] Match puppet-pacemaker branches to respective releases

Change-Id: I5a5ab37553d63f6b0939d1ea39402c59ad39a47c
---
 roles/run-test/templates/common_vars.bash.j2 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/roles/run-test/templates/common_vars.bash.j2 b/roles/run-test/templates/common_vars.bash.j2
index c1680700e..70e046ee4 100644
--- a/roles/run-test/templates/common_vars.bash.j2
+++ b/roles/run-test/templates/common_vars.bash.j2
@@ -7,11 +7,16 @@ export ZUUL_BRANCH=${ZUUL_BRANCH:-""}
 if [ "$ZUUL_BRANCH" = "stable/1.0" -o "$ZUUL_BRANCH" = "stable/2.0" -a "$ZUUL_PROJECT" = "openstack/openstack-virtual-baremetal" ]; then
     export ZUUL_BRANCH="master"
 fi
-# For puppet-pacemaker "stable/1.1.x" is a centos7 support branch
+# Match puppet-pacemaker branches to respective releases
 if [ "$ZUUL_BRANCH" = "stable/1.1.x" -a "$ZUUL_PROJECT" = "openstack/puppet-pacemaker" ]; then
-    export ZUUL_BRANCH="stable/train"
-    export STABLE_RELEASE="train"
+    export ZUUL_BRANCH="stable/wallaby"
+    export STABLE_RELEASE="wallaby"
 fi
+if [ "$ZUUL_BRANCH" = "stable/1.5.x" -a "$ZUUL_PROJECT" = "openstack/puppet-pacemaker" ]; then
+    export ZUUL_BRANCH="stable/zed"
+    export STABLE_RELEASE="zed"
+fi
+
 # For Ansible collection repo "stable/1.0.0" is a feature branch
 if [ "$ZUUL_BRANCH" = "stable/1.0.0" -a "$ZUUL_PROJECT" = "openstack/ansible-collections-openstack" ]; then
     export ZUUL_BRANCH="master"