From ce590c4c13173dd283f8d9ddf976f2c48b4870fd Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 12 Oct 2020 08:00:38 -0600 Subject: [PATCH] Add support for puppet-pacemaker stable We need to handle the puppet-pacemaker stable branches differently. Change-Id: I2057e9ebe496e62ff68370b48cee9eeb1ae984e8 --- roles/run-test/templates/common_vars.bash.j2 | 6 ++++++ scripts/common_vars.bash | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/roles/run-test/templates/common_vars.bash.j2 b/roles/run-test/templates/common_vars.bash.j2 index 8e269011d..f6ee267da 100644 --- a/roles/run-test/templates/common_vars.bash.j2 +++ b/roles/run-test/templates/common_vars.bash.j2 @@ -14,6 +14,12 @@ fi if [ "$ZUUL_BRANCH" = "stable/1.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 +if [ "$ZUUL_BRANCH" = "stable/1.1.x" -a "$ZUUL_PROJECT" = "openstack/puppet-pacemaker" ]; then + export ZUUL_BRANCH="stable/train" + export STABLE_RELEASE="train" +fi + export OVERRIDE_ZUUL_BRANCH=${OVERRIDE_ZUUL_BRANCH:-""} export STABLE_RELEASE=${STABLE_RELEASE:-""} diff --git a/scripts/common_vars.bash b/scripts/common_vars.bash index ee1c0b27d..dc5692c3a 100644 --- a/scripts/common_vars.bash +++ b/scripts/common_vars.bash @@ -15,6 +15,12 @@ fi if [ "$ZUUL_BRANCH" = "stable/1.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 +if [ "$ZUUL_BRANCH" = "stable/1.1.x" -a "$ZUUL_PROJECT" = "openstack/puppet-pacemaker" ]; then + export ZUUL_BRANCH="stable/train" + export STABLE_RELEASE="train" +fi + export OVERRIDE_ZUUL_BRANCH=${OVERRIDE_ZUUL_BRANCH:-""} export STABLE_RELEASE=${STABLE_RELEASE:-""}