From a5096eda64d33c46d8efedff2865da80f8ab422b Mon Sep 17 00:00:00 2001 From: Armando Migliaccio Date: Wed, 3 Jan 2018 18:16:03 -0800 Subject: [PATCH] Restore branch conditional on tempest-full This change partially reverts I5d34e5b983b720dc1913d00ccc1a16d81a040d49. Since the branch conditional can be more effectively applied on the job definition located in the tempest repo, there is no need to change the original override. Partial-bug: 1739829 Depends-on: I8e0aa11cd2d92d5d6f5e9147a407374948920e7f Change-Id: Ibfbc925af6eb274ced53312301b1733136ba4455 --- zuul.d/zuul-legacy-project-templates.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml index f0b90ce6..e2bc285d 100644 --- a/zuul.d/zuul-legacy-project-templates.yaml +++ b/zuul.d/zuul-legacy-project-templates.yaml @@ -172,19 +172,14 @@ jobs: - legacy-tempest-dsvm-neutron-full: branches: ^stable/(newton|ocata|pike)$ - # NOTE(andreaf) Only run on master for now. - # The negative lookup is redudant but it's a - # reminder that we don't want the job running there. - - tempest-full: - branches: ^(?!driverfixes/)master$ + - tempest-full - neutron-grenade: branches: ^(?!stable/newton).*$ gate: jobs: - legacy-tempest-dsvm-neutron-full: branches: ^stable/(newton|ocata|pike)$ - - tempest-full: - branches: ^(?!driverfixes/)master$ + - tempest-full - neutron-grenade: branches: ^(?!stable/newton).*$ experimental: