From 4ecea2589b217ff4bdec2267181e833a79615f07 Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Sat, 9 Dec 2017 09:23:22 +0100 Subject: [PATCH] =?UTF-8?q?Make=20sure=20we=20don=E2=80=99t=20use=20delore?= =?UTF-8?q?an-current=20for=20release=20!=3D=20master.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don’t want delorean-current for "to-pike" upgrade testing. Change-Id: I140ea62b91dfa9c10d40cf6cb896bc627d35f9bc --- .../templates/overcloud-repo-tripleo-ci.yaml.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/overcloud-upgrade/templates/overcloud-repo-tripleo-ci.yaml.j2 b/roles/overcloud-upgrade/templates/overcloud-repo-tripleo-ci.yaml.j2 index 6244f5eae..872e7a77a 100644 --- a/roles/overcloud-upgrade/templates/overcloud-repo-tripleo-ci.yaml.j2 +++ b/roles/overcloud-upgrade/templates/overcloud-repo-tripleo-ci.yaml.j2 @@ -33,6 +33,7 @@ parameter_defaults: enabled=1 EOF +{% if target_upgrade_version == 'master' %} cat<delorean-current.repo [delorean-current] name=delorean-current @@ -42,7 +43,7 @@ parameter_defaults: priority=10 includepkgs=diskimage-builder,instack,instack-undercloud,os-apply-config,os-collect-config,os-net-config,os-refresh-config,python-tripleoclient,openstack-puppet-modules,openstack-tripleo-*,puppet-* EOF - +{% endif %} cat<delorean-{{ target_upgrade_version }}-testing.repo [delorean-{{ target_upgrade_version }}-testing] name=delorean-{{ target_upgrade_version }}-testing