From 2c7749f2d0b9e051520c4ef73b14de46b06606a6 Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Thu, 16 Nov 2017 15:08:24 +0100 Subject: [PATCH] Use ZUUL_BRANCH_REAL indirection if it exist. the zuul_branch can be set to something not useful here like ceph/jewel. Ensure we use get the associated branch right. Change-Id: I7f944fc1e7b73c3b7c129e58857bf4448ca1e26d --- lib/puppet-openstack_spec_helper/beaker_spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet-openstack_spec_helper/beaker_spec_helper.rb b/lib/puppet-openstack_spec_helper/beaker_spec_helper.rb index 4e826ba..40c1a70 100644 --- a/lib/puppet-openstack_spec_helper/beaker_spec_helper.rb +++ b/lib/puppet-openstack_spec_helper/beaker_spec_helper.rb @@ -30,7 +30,7 @@ RSpec.configure do |c| # install git install_package host, 'git' - zuul_branch = ENV['ZUUL_BRANCH'] + zuul_branch = ENV['ZUUL_BRANCH_REAL'] || ENV['ZUUL_BRANCH'] puppet_maj_version = ENV['PUPPET_MAJ_VERSION'] repo = 'openstack/puppet-openstack-integration'