From 2959fa84f48b78e91f7e4513db8a71140563a396 Mon Sep 17 00:00:00 2001 From: Elod Illes Date: Wed, 15 Jul 2020 18:48:55 +0200 Subject: [PATCH] Enable neutron-grenade again for Stein, Rocky and Queens Devstack and Tempest jobs were recently fixed for all of the branches back till Pike. Now we can restore the neutron-grenade testing, as they are also working fine (see passing neutron-grenade in experimental jobs in Rocky [1]). As a successful grenade run on branch N needs a working devstack and tempest on branch N-1, the first branch where grenade will pass is Queens. [1] https://review.opendev.org/#/c/738548/ Change-Id: I0affa199406b82dc0315e4f1f6b0082ecde7aad4 --- zuul.d/zuul-legacy-project-templates.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml index c07fb461..db9aebf2 100644 --- a/zuul.d/zuul-legacy-project-templates.yaml +++ b/zuul.d/zuul-legacy-project-templates.yaml @@ -19,10 +19,10 @@ - tempest-full - neutron-grenade: # NOTE(gmann): Do not run the grenade job for - # Extended Maintainance or oldest stable branch. - # Now this is only needed for stable/train as + # the oldest stable branch. + # Now this is only needed up till stable/train as # stable/ussuri onwards we use integrated-gate-py3. - branches: stable/train + branches: ^stable/(queens|rocky|stein|train).*$ gate: jobs: - legacy-tempest-dsvm-neutron-full: @@ -30,10 +30,10 @@ - tempest-full - neutron-grenade: # NOTE(gmann): Do not run the grenade job for - # Extended Maintainance or oldest stable branch. - # Now this is only needed for stable/train as + # the oldest stable branch. + # Now this is only needed up till stable/train as # stable/ussuri onwards we use integrated-gate-py3. - branches: stable/train + branches: ^stable/(queens|rocky|stein|train).*$ - project-template: name: puppet-module-unit-jobs