openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Add support for puppet-pacemaker stable"

This commit is contained in:
Zuul 2020-10-21 23:35:42 +00:00 committed by Gerrit Code Review
parent 2781d196ad ce590c4c13
commit 3e484b5f43
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/run-test/templates/common_vars.bash.j2
View File

@ -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:-""}

6
scripts/common_vars.bash
View File

@ -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:-""}