From d12285b25b40031ec90743c45b095d1bbcba4ca4 Mon Sep 17 00:00:00 2001 From: silvacarloss Date: 2022年6月30日 16:58:08 -0300 Subject: [PATCH] Follow up for CI jobs refactoring This changes addresses few comments left in the change that refactored some of our CI jobs [1], regarding a more suggestive anchor name and a comment to give more context for code reviewers in the future. [1] https: //review.opendev.org/c/openstack/manila-tempest-plugin/+/847366 Change-Id: I4abf0d60e6662c6f409bfa6506ab51ea717dc8cf --- zuul.d/manila-tempest-jobs.yaml | 12 ++++++------ zuul.d/manila-tempest-stable-jobs.yaml | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml index f150a2b5..6527598a 100644 --- a/zuul.d/manila-tempest-jobs.yaml +++ b/zuul.d/manila-tempest-jobs.yaml @@ -166,7 +166,7 @@ name: manila-tempest-plugin-zfsonlinux description: Test ZFSOnLinux multibackend (DHSS=False) with postgresql db parent: manila-tempest-plugin-zfsonlinux-base - branches: &jammy_ubuntu_focal_branches ^(?!stable/(yoga|xena|wallaby|victoria|ussuri)).*$ + branches: &ubuntu_jammy_test_image_branches ^(?!stable/(yoga|xena|wallaby|victoria|ussuri)).*$ - job: name: manila-tempest-plugin-lvm-base @@ -218,7 +218,7 @@ description: | Test LVM multibackend (DHSS=False) in a 4+6 (dual-stack) devstack environment with IPv6 control plane endpoints. - branches: *jammy_ubuntu_focal_branches + branches: *ubuntu_jammy_test_image_branches parent: manila-tempest-plugin-lvm-base - job: @@ -311,7 +311,7 @@ Test the scenario test cases on the generic driver multibackend (DHSS=True) with NFS and CIFS parent: manila-tempest-plugin-generic-base - branches: *jammy_ubuntu_focal_branches + branches: *ubuntu_jammy_test_image_branches - job: name: manila-tempest-plugin-generic-scenario-base @@ -333,7 +333,7 @@ Test the scenario test cases on the generic driver multibackend (DHSS=True) with NFS and CIFS parent: manila-tempest-plugin-generic-scenario-base - branches: *jammy_ubuntu_focal_branches + branches: *ubuntu_jammy_test_image_branches - job: name: manila-tempest-plugin-cephfs-native-base @@ -379,7 +379,7 @@ name: manila-tempest-plugin-cephfs-native description: Test CephFS Native (DHSS=False) parent: manila-tempest-plugin-cephfs-native-base - branches: *jammy_ubuntu_focal_branches + branches: *ubuntu_jammy_test_image_branches - job: name: manila-tempest-plugin-cephfs-nfs-base @@ -431,7 +431,7 @@ name: manila-tempest-plugin-cephfs-nfs description: Test CephFS NFS (DHSS=False) parent: manila-tempest-plugin-cephfs-nfs-base - branches: *jammy_ubuntu_focal_branches + branches: *ubuntu_jammy_test_image_branches - job: name: manila-tempest-plugin-dummy-no-dhss diff --git a/zuul.d/manila-tempest-stable-jobs.yaml b/zuul.d/manila-tempest-stable-jobs.yaml index d48f6241..034b6d9c 100644 --- a/zuul.d/manila-tempest-stable-jobs.yaml +++ b/zuul.d/manila-tempest-stable-jobs.yaml @@ -27,6 +27,9 @@ - job: name: manila-tempest-plugin-lvm-stable + # NOTE(carloss): we are aware that focal is the current default, but + # in order to avoid breakages when devstack-minimal switches to a newer + # branch, we are pinning focal here. nodeset: openstack-single-node-focal description: | Test LVM multibackend (DHSS=False) in a 4+6 (dual-stack) devstack

AltStyle によって変換されたページ (->オリジナル) /