Merge "tox: Fix broken releasenotes target"
diff --git a/.zuul.yaml b/.zuul.yaml
index 858f1d0..af6bbd3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,7 +2,7 @@
     name: telemetry-tempest-base
     parent: devstack-tempest
     description: |
-      This job is for testing telemetry components. We test stable branches from wallaby onwards.
+      This job is for testing telemetry components.
     irrelevant-files:
       - ^(test-|)requirements.txt$
       - ^setup.cfg$
@@ -65,14 +65,6 @@
     name: telemetry-dsvm-integration
     parent: telemetry-tempest-base
 
-# TODO(gmann): As per the 2025.1 testing runtime, we need to run at least
-# one job on jammy. This job can be removed in the next cycle(2025.2)
-- job:
-    name: telemetry-dsvm-integration-ubuntu-jammy
-    description: This is integrated compute job testing on Ubuntu jammy(22.04)
-    parent: telemetry-dsvm-integration
-    nodeset: openstack-single-node-jammy
-
 - job:
     name: telemetry-dsvm-integration-2024-2
     parent: telemetry-tempest-base
@@ -141,15 +133,6 @@
     vars: *no_prometheus_vars
 
 - job:
-    name: telemetry-dsvm-integration
-    parent: telemetry-tempest-base
-    branches:
-      - stable/wallaby
-    vars:
-      devstack_localrc:
-        USE_PYTHON3: False
-
-- job:
     name: telemetry-dsvm-integration-ipv6-only-base
     parent: devstack-tempest-ipv6
     description: |
@@ -202,41 +185,6 @@
     vars: *no_prometheus_vars
 
 - job:
-    name: telemetry-dsvm-integration-wallaby
-    parent: telemetry-dsvm-integration
-    nodeset: openstack-single-node-focal
-    override-checkout: stable/wallaby
-    voting: false
-
-- job:
-    name: telemetry-dsvm-integration-centos-8s
-    nodeset: devstack-single-node-centos-8-stream
-    parent: telemetry-dsvm-integration
-    branches:
-      - stable/wallaby
-      - stable/xena
-      - stable/yoga
-    description: |
-      Telemetry devstack tempest test job for Centos 8 stream system using python 36
-      i.e. yoga and below
-    vars:
-      devstack_localrc:
-        # for versions of devstack that don't explicitly support rhel8
-        FORCE: 'yes'
-        TEMPEST_BRANCH: '30.1.0'
-        TEMPEST_VENV_UPPER_CONSTRAINTS: '/opt/stack/requirements/upper-constraints.txt'
-
-- job:
-    name: telemetry-dsvm-integration-centos-8s-fips
-    parent: telemetry-dsvm-integration-centos-8s
-    description: |
-      Telemetry devstack tempest tests job for a FIPS enabled Centos 8 stream system using python36
-      i.e. yoga and below
-    pre-run: playbooks/enable-fips.yaml
-    vars:
-      nslookup_target: 'opendev.org'
-
-- job:
     name: telemetry-dsvm-integration-centos-9s
     nodeset: devstack-single-node-centos-9-stream
     parent: telemetry-dsvm-integration
@@ -260,14 +208,10 @@
     check:
       jobs:
         - telemetry-dsvm-integration
-        - telemetry-dsvm-integration-ubuntu-jammy
         - telemetry-dsvm-integration-2024-1
         - telemetry-dsvm-integration-2024-2
         - telemetry-dsvm-integration-ipv6-only
-        - telemetry-dsvm-integration-centos-9s
-        - telemetry-dsvm-integration-centos-9s-fips
     gate:
       jobs:
         - telemetry-dsvm-integration
-        - telemetry-dsvm-integration-ubuntu-jammy
         - telemetry-dsvm-integration-ipv6-only