From a4797fa9b32a74a5f1c7598cfc6fee86ae1d2246 Mon Sep 17 00:00:00 2001 From: Sandeep Yadav Date: Fri, 4 Jun 2021 12:33:23 +0530 Subject: [PATCH] Add ovb 2.0 in condition to redefine ZUUL_BRANCH openstack-virtual-baremetal project now have 2.0 branch, But TripleO jobs knows about OpenStack branches only - master, wallaby, etc. It doesn't know about 1.0 or 2.0. We redefine ZUUL_BRANCH to be "master" so we run actual TripleO master job on OVB branches. Closes-Bug: #1930723 Change-Id: Ib2f6e8d35ae2bb7e0956de0767a7ac328ccc631c --- roles/run-test/templates/common_vars.bash.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/run-test/templates/common_vars.bash.j2 b/roles/run-test/templates/common_vars.bash.j2 index f6ee267da..04646e895 100644 --- a/roles/run-test/templates/common_vars.bash.j2 +++ b/roles/run-test/templates/common_vars.bash.j2 @@ -11,7 +11,7 @@ if [ "$ZUUL_BRANCH" = "stable/jewel" ]; then export STABLE_RELEASE="ocata" fi # For OVB repo "stable/1.0" is feature branch -if [ "$ZUUL_BRANCH" = "stable/1.0" -a "$ZUUL_PROJECT" = "openstack/openstack-virtual-baremetal" ]; then +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