From 1fc406ddc632d2225e6bc46dcb2eae658971a700 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Thu, 9 May 2019 14:22:07 +0200 Subject: [PATCH] Dont run puppet 4 unit on master Was deprecated in Stein so we continue to run them there but for Train it's not supported so removing testing on master. Change-Id: I062c7e21fa8a2aa35fbf8768c752715868da5132 --- zuul.d/libraries.yaml | 1 + zuul.d/linters.yaml | 2 ++ zuul.d/unit.yaml | 1 + 3 files changed, 4 insertions(+) diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml index 6a12a6932..59de7ae47 100644 --- a/zuul.d/libraries.yaml +++ b/zuul.d/libraries.yaml @@ -5,6 +5,7 @@ name: puppet-openstack-libraries-puppet-unit-4.8-centos-7 parent: puppet-openstack-libraries-puppet-unit-base nodeset: centos-7 + branches: ^stable/(ocata|pike|queens|rocky|stein)$ vars: puppet_gem_version: 4.8 diff --git a/zuul.d/linters.yaml b/zuul.d/linters.yaml index d8af39fb1..773983172 100644 --- a/zuul.d/linters.yaml +++ b/zuul.d/linters.yaml @@ -12,6 +12,7 @@ - job: name: puppet-openstack-syntax-4-ubuntu-bionic parent: puppet-openstack-syntax-base + branches: ^stable/(ocata|pike|queens|rocky|stein)$ vars: puppet: 4 @@ -55,6 +56,7 @@ name: puppet-openstack-libraries-puppet-syntax-4-centos-7 parent: puppet-openstack-libraries-puppet-syntax nodeset: centos-7 + branches: ^stable/(ocata|pike|queens|rocky|stein)$ vars: puppet: 4 diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml index 17f1c0b08..1f9f12586 100644 --- a/zuul.d/unit.yaml +++ b/zuul.d/unit.yaml @@ -5,6 +5,7 @@ name: puppet-openstack-unit-4.8-centos-7 parent: puppet-openstack-unit-base nodeset: centos-7 + branches: ^stable/(ocata|pike|queens|rocky|stein)$ vars: puppet_gem_version: 4.8