Merge "Fix remote_client param description"
diff --git a/doc/source/test_removal.rst b/doc/source/test_removal.rst
index a3bb645..bb223b1 100644
--- a/doc/source/test_removal.rst
+++ b/doc/source/test_removal.rst
@@ -50,19 +50,10 @@
a Depends-On in the commit message for the commit which moved the test into
another repo.
-For prong 2 you can use OpenStack-Health:
+For prong 2 you can use subunit2sql:
-Using OpenStack-Health
-""""""""""""""""""""""
-
-Go to: http://status.openstack.org/openstack-health and then navigate to a per
-test page for six months. You'll end up with a page that will graph the success
-and failure rates on the bottom graph. For example, something like `this URL`_.
-
-.. _this URL: http://status.openstack.org/openstack-health/#/test/tempest.scenario.test_volume_boot_pattern.TestVolumeBootPatternV2.test_volume_boot_pattern?groupKey=project&resolutionKey=day&duration=P6M
-
-The Old Way using subunit2sql directly
-""""""""""""""""""""""""""""""""""""""
+Using subunit2sql directly
+""""""""""""""""""""""""""
``SELECT * from tests where test_id like "%test_id%";``
(where ``$test_id`` is the full test_id, but truncated to the class because of
diff --git a/tools/check_logs.py b/tools/check_logs.py
index 8ab3af2..8ea94e8 100755
--- a/tools/check_logs.py
+++ b/tools/check_logs.py
@@ -136,7 +136,7 @@
with open(ALLOW_LIST_FILE) as stream:
loaded = yaml.safe_load(stream)
if loaded:
- for (name, l) in loaded.values():
+ for (name, l) in loaded.items():
for w in l:
assert 'module' in w, 'no module in %s' % name
assert 'message' in w, 'no message in %s' % name
diff --git a/zuul.d/integrated-gate.yaml b/zuul.d/integrated-gate.yaml
index d35e25d..3dd8c49 100644
--- a/zuul.d/integrated-gate.yaml
+++ b/zuul.d/integrated-gate.yaml
@@ -87,6 +87,19 @@
horizon: true
- job:
+ name: tempest-full-centos-9-stream
+ parent: tempest-full-py3
+ nodeset: devstack-single-node-centos-9-stream
+ # centos-9-stream is supported from yoga release onwards
+ branches: ^(?!stable/(pike|queens|rocky|stein|train|ussuri|victoria|wallaby|xena)).*$
+ description: |
+ Base integration test on CentOS 9 stream
+ vars:
+ # Required until bug/1949606 is resolved when using libvirt and QEMU
+ # >=5.0.0 with a [libvirt]virt_type of qemu (TCG).
+ configure_swap_size: 4096
+
+- job:
name: tempest-integrated-networking
parent: devstack-tempest
branches: ^(?!stable/ocata).*$
@@ -129,17 +142,16 @@
c-bak: false
- job:
- name: tempest-integrated-compute-centos-8-stream
+ name: tempest-integrated-compute-centos-9-stream
parent: tempest-integrated-compute
- # TODO(gmann): Make this job non voting until bug#1957941 if fixed.
- voting: false
- nodeset: devstack-single-node-centos-8-stream
- branches: ^(?!stable/(ocata|pike|queens|rocky|stein|train|ussuri|victoria)).*$
+ nodeset: devstack-single-node-centos-9-stream
+ # centos-9-stream is supported from yoga release onwards
+ branches: ^(?!stable/(pike|queens|rocky|stein|train|ussuri|victoria|wallaby|xena)).*$
description: |
This job runs integration tests for compute. This is
subset of 'tempest-full-py3' job and run Nova, Neutron, Cinder (except backup tests)
and Glance related tests. This is meant to be run on Nova gate only.
- This version of the job also uses CentOS 8 stream.
+ This version of the job also uses CentOS 9 stream.
vars:
# Required until bug/1949606 is resolved when using libvirt and QEMU
# >=5.0.0 with a [libvirt]virt_type of qemu (TCG).
@@ -352,17 +364,27 @@
(Nova, Neutron, Cinder and Glance related) in check and gate
for the Nova integrated gate. This is meant to be
run on Nova gate only.
+ # NOTE(gmann): This template is used for stable branches also so when we
+ # add/remove jobs here we need to make sure we should not change the
+ # behaviour for stable branches. For example, with branch variant we need
+ # to make sure old job keep running on stable branches and the new one run
+ # only from master(or the branch it was meant to run).
check:
jobs:
- grenade-skip-level:
voting: false
- tempest-integrated-compute
- - tempest-integrated-compute-centos-8-stream
+ # centos-8-stream is tested from wallaby -> yoga branches
+ - tempest-integrated-compute-centos-8-stream:
+ branches: ^stable/(wallaby|xena|yoga).*$
+ # centos-9-stream is tested from zed release onwards
+ - tempest-integrated-compute-centos-9-stream:
+ branches: ^(?!stable/(pike|queens|rocky|stein|train|ussuri|victoria|wallaby|xena|yoga)).*$
- openstacksdk-functional-devstack
gate:
jobs:
- tempest-integrated-compute
- - tempest-integrated-compute-centos-8-stream
+ - tempest-integrated-compute-centos-9-stream
- openstacksdk-functional-devstack
- project-template:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index eb8b793..b79cdc9 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -120,8 +120,6 @@
irrelevant-files: *tempest-irrelevant-files
- openstack-tox-bashate:
irrelevant-files: *tempest-irrelevant-files-2
- - tempest-full-py3-centos-8-stream:
- irrelevant-files: *tempest-irrelevant-files
- tempest-full-centos-9-stream:
irrelevant-files: *tempest-irrelevant-files
gate:
@@ -137,8 +135,6 @@
irrelevant-files: *tempest-irrelevant-files
- tempest-full-py3:
irrelevant-files: *tempest-irrelevant-files
- - tempest-full-py3-centos-8-stream:
- irrelevant-files: *tempest-irrelevant-files
- grenade:
irrelevant-files: *tempest-irrelevant-files
- tempest-ipv6-only:
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index 8086458..edee044 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -198,3 +198,41 @@
- stable/victoria
- stable/wallaby
- stable/xena
+
+- job:
+ name: tempest-integrated-compute-centos-8-stream
+ parent: tempest-integrated-compute
+ # TODO(gmann): Make this job non voting until bug#1957941 if fixed.
+ voting: false
+ nodeset: devstack-single-node-centos-8-stream
+ branches:
+ - stable/wallaby
+ - stable/xena
+ - stable/yoga
+ description: |
+ This job runs integration tests for compute. This is
+ subset of 'tempest-full-py3' job and run Nova, Neutron, Cinder (except backup tests)
+ and Glance related tests. This is meant to be run on Nova gate only.
+ This version of the job also uses CentOS 8 stream.
+ vars:
+ # Required until bug/1949606 is resolved when using libvirt and QEMU
+ # >=5.0.0 with a [libvirt]virt_type of qemu (TCG).
+ configure_swap_size: 4096
+
+- job:
+ name: tempest-full-py3-centos-8-stream
+ parent: tempest-full-py3
+ # TODO(gmann): Make this job non voting until bug#1957941 if fixed.
+ voting: false
+ branches:
+ - stable/wallaby
+ - stable/xena
+ - stable/yoga
+ nodeset: devstack-single-node-centos-8-stream
+ description: |
+ Base integration test with Neutron networking and py36 running
+ on CentOS 8 stream
+ vars:
+ # Required until bug/1949606 is resolved when using libvirt and QEMU
+ # >=5.0.0 with a [libvirt]virt_type of qemu (TCG).
+ configure_swap_size: 4096
diff --git a/zuul.d/tempest-specific.yaml b/zuul.d/tempest-specific.yaml
index a4a4b67..822feaa 100644
--- a/zuul.d/tempest-specific.yaml
+++ b/zuul.d/tempest-specific.yaml
@@ -69,26 +69,6 @@
c-bak: false
- job:
- name: tempest-full-py3-centos-8-stream
- parent: tempest-full-py3
- # TODO(gmann): Make this job non voting until bug#1957941 if fixed.
- voting: false
- nodeset: devstack-single-node-centos-8-stream
- description: |
- Base integration test with Neutron networking and py36 running
- on CentOS 8 stream
- vars:
- # Required until bug/1949606 is resolved when using libvirt and QEMU
- # >=5.0.0 with a [libvirt]virt_type of qemu (TCG).
- configure_swap_size: 4096
-
-- job:
- name: tempest-full-centos-9-stream
- parent: tempest-full-py3-centos-8-stream
- voting: true
- nodeset: devstack-single-node-centos-9-stream
-
-- job:
name: tempest-tox-plugin-sanity-check
parent: tox
description: |