From 7c0ece1a102f82e519e7030f4100ba9d68665dfa Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Fri, 9 Feb 2024 13:37:21 -0800 Subject: [PATCH] [CI] Grenade testing updates Grenade on this branch should test: - upgrading from 2023.2 to 2024.1 (current) - upgrading from 2023.1 to 2024.1 (skipping 2023.2) Both of these tests must be "voting". Also drop some deprecated config params in the job definitions. Change-Id: I90ac6586d1a35d42edd2fcd329d18ef15acada9e Signed-off-by: Goutham Pacha Ravi --- zuul.d/grenade-jobs.yaml | 10 +--------- zuul.d/project.yaml | 9 ++------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/zuul.d/grenade-jobs.yaml b/zuul.d/grenade-jobs.yaml index 4b24e48ab9..9220aba050 100644 --- a/zuul.d/grenade-jobs.yaml +++ b/zuul.d/grenade-jobs.yaml @@ -28,12 +28,6 @@ MANILA_CONFIGURE_DEFAULT_TYPES: true SHARE_DRIVER: manila.share.drivers.lvm.LVMShareDriver MANILA_ENABLED_BACKENDS: london,paris - # TODO(vkmc) Grenade uses prior branch for running tests - # Drop this variables in Xena once Wallaby is shipped - MANILA_BACKEND1_CONFIG_GROUP_NAME: london - MANILA_BACKEND2_CONFIG_GROUP_NAME: paris - MANILA_SHARE_BACKEND1_NAME: LONDON - MANILA_SHARE_BACKEND2_NAME: PARIS MANILA_OPTGROUP_london_driver_handles_share_servers: false MANILA_OPTGROUP_paris_driver_handles_share_servers: false SHARE_BACKING_FILE_SIZE: 32000M @@ -97,6 +91,4 @@ vars: # Move this forward when a new release cycle start. grenade_from_branch # should be always N-2 from master. - grenade_from_branch: stable/zed - grenade_localrc: - NOVA_ENABLE_UPGRADE_WORKAROUND: True + grenade_from_branch: stable/2023.1 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 4f40f15833..1e0bef0d58 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -26,13 +26,8 @@ voting: false - manila-tempest-plugin-lvm-fips: voting: false - - manila-grenade: - voting: false - # NOTE: this job needs to be voting in SLURP release and option to - # voting in non SLURP. But keeping it voting in non SLURP also will - # help us to know any upgrade break in advance. - - manila-grenade-skip-level-always: - voting: false + - manila-grenade + - manila-grenade-skip-level-always - manila-rally-no-ss: voting: false - manila-rally-ss: