From e4e00a79ed3c934908d06be1eb1434727d288df5 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Fri, 24 Sep 2021 17:55:34 -0500 Subject: [PATCH] Update grenade setting in stable/xena Along with updating the grenade setting in stable/xena, adding the forward upgrade job as experimental. Change-Id: I2782577c3ffc3c0f3e53afae4081ac0c6906da5a --- .zuul.yaml | 4 +++- roles/configure-grenade-branches/defaults/main.yaml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index d73899ff..74f1e4fa 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -17,6 +17,7 @@ - octavia-grenade experimental: jobs: + - grenade-forward - grenade-postgresql - job: @@ -331,7 +332,8 @@ vars: # When a stable branch stable/X is created from master, # this value should be updated to stable/X. - grenade_from_branch: master + grenade_from_branch: stable/xena + grenade_to_branch: master - job: name: grenade-dsvm-neutron-forward diff --git a/roles/configure-grenade-branches/defaults/main.yaml b/roles/configure-grenade-branches/defaults/main.yaml index fea7d2de..fee5d2ba 100644 --- a/roles/configure-grenade-branches/defaults/main.yaml +++ b/roles/configure-grenade-branches/defaults/main.yaml @@ -1,3 +1,3 @@ --- grenade_from_branch: stable/wallaby -grenade_to_branch: master +grenade_to_branch: stable/xena