Merge "Make broken tempest-full-py3-opensuse15 job only until stable/xena"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 3f98f7e..731a72a 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -159,8 +159,6 @@
irrelevant-files: *tempest-irrelevant-files
- tempest-pg-full:
irrelevant-files: *tempest-irrelevant-files
- - tempest-full-py3-opensuse15:
- irrelevant-files: *tempest-irrelevant-files
- tempest-centos8-stream-fips:
irrelevant-files: *tempest-irrelevant-files
periodic-stable:
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index da6cc46..5cc0dd0 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -178,3 +178,24 @@
subnode:
devstack_localrc:
USE_PYTHON3: true
+
+- job:
+ name: tempest-full-py3-opensuse15
+ parent: tempest-full-py3
+ nodeset: devstack-single-node-opensuse-15
+ description: |
+ Base integration test with Neutron networking and py36 running
+ on openSUSE Leap 15.x
+ voting: false
+ # This job is not used after stable/xena and can be
+ # removed once stable/xena is EOL.
+ branches:
+ - stable/pike
+ - stable/queens
+ - stable/rocky
+ - stable/stein
+ - stable/train
+ - stable/ussuri
+ - stable/victoria
+ - stable/wallaby
+ - stable/xena
diff --git a/zuul.d/tempest-specific.yaml b/zuul.d/tempest-specific.yaml
index a24c73d..5b6b702 100644
--- a/zuul.d/tempest-specific.yaml
+++ b/zuul.d/tempest-specific.yaml
@@ -69,15 +69,6 @@
c-bak: false
- job:
- name: tempest-full-py3-opensuse15
- parent: tempest-full-py3
- nodeset: devstack-single-node-opensuse-15
- description: |
- Base integration test with Neutron networking and py36 running
- on openSUSE Leap 15.x
- voting: 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.