From b4c94c8c4ee0ba8f514bb833fb283a0107f206ef Mon Sep 17 00:00:00 2001
From: Goutham Pacha Ravi <gouthampravi@gmail.com>
Date: Thu, 9 Dec 2021 11:46:40 -0800
Subject: [PATCH] Add stable/xena job and drop stable/ussuri job
stable/ussuri has now been transitioned to EM (Extended Maintenance) [1].
So we can stop testing manila-tempest-plugin changes against that branch,
and introduce a stable/xena job.
Dropping the stable/ussuri job does not mean that manila-tempest-plugin
does not support running against that branch. Extended maintenance
branches (stable/ussuri, train and stein at the moment) still get
per-commit testing when changes are posted to the manila repo against
those branches.
Change-Id: I1e019ec913f8933d50afae6739352686725f4780
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
---
 zuul.d/manila-tempest-jobs.yaml &#124; 2 ++
 zuul.d/manila-tempest-stable-jobs.yaml &#124; 18 ++++++++++--------
 zuul.d/project.yaml &#124; 2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml
index f31ff117..494b285d 100644
--- a/zuul.d/manila-tempest-jobs.yaml
+++ b/zuul.d/manila-tempest-jobs.yaml
@@ -60,6 +60,8 @@
 required-projects: *manila-tempest-required-projects
 vars:
 <<: *manila-tempest-base-vars
+ # NOTE(gouthamr): Disabled until https://launchpad.net/bugs/1940324 is
+ # fixed.
 tempest_exclude_regex: "(^manila_tempest_tests.tests.scenario.*IPv6.*)"
 
 - job:
diff --git a/zuul.d/manila-tempest-stable-jobs.yaml b/zuul.d/manila-tempest-stable-jobs.yaml
index ff74f5d9..3d2447e6 100644
--- a/zuul.d/manila-tempest-stable-jobs.yaml
+++ b/zuul.d/manila-tempest-stable-jobs.yaml
@@ -1,5 +1,15 @@
 # Stable branch jobs to test the trunk version of manila-tempest-plugin against
 # released stable branches of manila
+- job:
+ name: manila-tempest-plugin-lvm-xena
+ parent: manila-tempest-plugin-lvm
+ override-checkout: stable/xena
+ nodeset: openstack-single-node-focal
+ vars:
+ # NOTE(gouthamr): Disabled until https://launchpad.net/bugs/1940324 is
+ # fixed.
+ tempest_exclude_regex: "(^manila_tempest_tests.tests.scenario.*IPv6.*)"
+
 - job:
 name: manila-tempest-plugin-lvm-wallaby
 parent: manila-tempest-plugin-lvm
@@ -15,11 +25,3 @@
 nodeset: openstack-single-node-focal
 vars:
 tempest_exclude_regex: ''
-
-- job:
- name: manila-tempest-plugin-lvm-ussuri
- parent: manila-tempest-plugin-lvm
- override-checkout: stable/ussuri
- nodeset: openstack-single-node-bionic
- vars:
- tempest_exclude_regex: ''
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index bfeaa7b8..ce215477 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,9 +7,9 @@
 - manila-tempest-plugin-dummy-no-dhss
 - manila-tempest-plugin-dummy-dhss
 - manila-tempest-plugin-lvm
+ - manila-tempest-plugin-lvm-xena
 - manila-tempest-plugin-lvm-wallaby
 - manila-tempest-plugin-lvm-victoria
- - manila-tempest-plugin-lvm-ussuri
 - manila-tempest-plugin-zfsonlinux:
 voting: false
 - manila-tempest-plugin-cephfs-native:
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/manila-tempest-plugin/commit/b4c94c8c4ee0ba8f514bb833fb283a0107f206ef.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/manila-tempest-plugin/commit/b4c94c8c4ee0ba8f514bb833fb283a0107f206ef.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>