Skip to content

Commit 529e273

Browse files
committed
Stop running upgrade testing for EOL branches
stable/2024.2 is EOL and grenade job on stable/2025.1 is testing upgrade from stable/2024.2 to stable/2025.1 which is broken. Adding branch variant to grenade job in interated template so that we do not run those on EOL branch upgrade testing. Also, remove the grenade skip levle job for stable/2023.1 Change-Id: I98e0f68b69e967797880663947bd2791292039b3 Signed-off-by: Ghanshyam Maan <gmaan.os14@gmail.com>
1 parent 186f80c commit 529e273

1 file changed

Lines changed: 28 additions & 27 deletions

File tree

zuul.d/integrated-gate.yaml

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -485,19 +485,10 @@
485485
# only from master(or the branch it was meant to run).
486486
check:
487487
jobs:
488-
# NOTE(gmann): These template are generic and used on stable branch
489-
# as well as master testing. So grenade-skip-level on stable/2023.1
490-
# which test stable/yoga to stable/2023.1 upgrade is non-voting.
491-
- grenade-skip-level:
492-
voting: false
493-
branches:
494-
- stable/2023.1
495488
# NOTE(gmann): Nova decided to run grenade skip level testing always
496489
# (on SLURP as well as non SLURP release) so we are adding grenade-skip-level-always
497490
# job in integrated gate and we do not need to update skip level job
498491
# here until Nova change the decision.
499-
# This is added from 2023.2 release cycle onwards so we need to use branch variant
500-
# to make sure we do not run this job on older than 2023.2 gate.
501492
- grenade-skip-level-always:
502493
branches:
503494
- ^.*/2024.1
@@ -543,14 +534,11 @@
543534
run on Placement gate only.
544535
check:
545536
jobs:
546-
- grenade
547-
# NOTE(gmann): These template are generic and used on stable branch
548-
# as well as master testing. So grenade-skip-level on stable/2023.1
549-
# which test stable/yoga to stable/2023.1 upgrade is non-voting.
550-
- grenade-skip-level:
551-
voting: false
537+
- grenade:
552538
branches:
553-
- stable/2023.1
539+
- ^.*/2025.2
540+
- ^.*/2026.1
541+
- master
554542
# on stable/2024.1(SLURP) grenade-skip-level is voting which test
555543
# stable/2023.1 to stable/2024.1 upgrade. This is supposed to run on
556544
# SLURP release only.
@@ -577,7 +565,11 @@
577565
negate: true
578566
gate:
579567
jobs:
580-
- grenade
568+
- grenade:
569+
branches:
570+
- ^.*/2025.2
571+
- ^.*/2026.1
572+
- master
581573
- tempest-integrated-placement
582574
# on stable/2024.1(SLURP) grenade-skip-level is voting which test
583575
# stable/2023.1 to stable/2024.1 upgrade. This is supposed to run on
@@ -612,14 +604,11 @@
612604
run on Cinder and Glance gate only.
613605
check:
614606
jobs:
615-
- grenade
616-
# NOTE(gmann): These template are generic and used on stable branch
617-
# as well as master testing. So grenade-skip-level on stable/2023.1
618-
# which test stable/yoga to stable/2023.1 upgrade is non-voting.
619-
- grenade-skip-level:
620-
voting: false
607+
- grenade:
621608
branches:
622-
- stable/2023.1
609+
- ^.*/2025.2
610+
- ^.*/2026.1
611+
- master
623612
# on stable/2024.1(SLURP) grenade-skip-level is voting which test
624613
# stable/2023.1 to stable/2024.1 upgrade. This is supposed to run on
625614
# SLURP release only.
@@ -646,7 +635,11 @@
646635
negate: true
647636
gate:
648637
jobs:
649-
- grenade
638+
- grenade:
639+
branches:
640+
- ^.*/2025.2
641+
- ^.*/2026.1
642+
- master
650643
# on stable/2024.1(SLURP) grenade-skip-level is voting which test
651644
# stable/2023.1 to stable/2024.1 upgrade. This is supposed to run on
652645
# SLURP release only.
@@ -681,7 +674,11 @@
681674
run on swift gate only.
682675
check:
683676
jobs:
684-
- grenade
677+
- grenade:
678+
branches:
679+
- ^.*/2025.2
680+
- ^.*/2026.1
681+
- master
685682
# on stable/2024.1(SLURP) grenade-skip-level is voting which test
686683
# stable/2023.1 to stable/2024.1 upgrade. This is supposed to run on
687684
# SLURP release only.
@@ -708,7 +705,11 @@
708705
negate: true
709706
gate:
710707
jobs:
711-
- grenade
708+
- grenade:
709+
branches:
710+
- ^.*/2025.2
711+
- ^.*/2026.1
712+
- master
712713
# on stable/2024.1(SLURP) grenade-skip-level is voting which test
713714
# stable/2023.1 to stable/2024.1 upgrade. This is supposed to run on
714715
# SLURP release only.

0 commit comments

Comments
 (0)