From e12816c019fa9ff69c3845e213c08087509969f5 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 14 Oct 2024 02:28:56 +0900
Subject: [PATCH] Add stable branch jobs

tempest and its plugin follow the branchless model and should support
all active stable branches, thus we should verify that the latest
tempest plugin works with stable branches.

Also drop stable/wallaby job from gate, because it is no longer
maintained.

Change-Id: Ieb905de29f5fb9c0f4a86bf558cf29b257427a6e
---
 .zuul.yaml | 53 +++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index daa30ec..2f8964c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -33,18 +33,9 @@
       devstack_services:
         tempest: true
       devstack_localrc:
-        USE_PYTHON3: True
         TEMPEST_PLUGINS: '"/opt/stack/telemetry-tempest-plugin /opt/stack/heat-tempest-plugin"'
         GNOCCHI_ARCHIVE_POLICY_TEMPEST: "ceilometer-high-rate"
-        # NOTE(jwysogla): We can define both of the variables. In versions, where
-        # the ceilometer devstack plugin doesn't support the CEILOMETER_BACKENDS,
-        # it'll just ignore it and use the CEILOMETER_BACKEND. In versions, where
-        # CEILOMETER_BACKENDS is supported, the ceilometer devstack plugin will
-        # just try to merge the variables, so the final contents in this casse will
-        # be "gnocchi,sg-core"
-        CEILOMETER_BACKEND: "gnocchi"
         CEILOMETER_BACKENDS: "gnocchi,sg-core"
-        PROMETHEUS_SERVICE_SCRAPE_TARGETS: "sg-core"
         CEILOMETER_PIPELINE_INTERVAL: 15
         CEILOMETER_ALARM_THRESHOLD: 6000000000
         GLOBAL_VENV: False
@@ -65,6 +56,45 @@
     name: telemetry-dsvm-integration
     parent: telemetry-tempest-base
 
+- job:
+    name: telemetry-dsvm-integration-2024-2
+    parent: telemetry-tempest-base
+    override-checkout: stable/2024.2
+
+- job:
+    name: telemetry-dsvm-integration-2024-1
+    parent: telemetry-tempest-base
+    override-checkout: stable/2024.1
+
+- job:
+    name: telemetry-dsvm-integration-2023-2
+    parent: telemetry-tempest-base
+    override-checkout: stable/2023.2
+    vars: &no_prometheus_vars
+      devstack_localrc:
+        TEMPEST_PLUGINS: '"/opt/stack/telemetry-tempest-plugin /opt/stack/heat-tempest-plugin"'
+        GNOCCHI_ARCHIVE_POLICY_TEMPEST: "ceilometer-high-rate"
+        CEILOMETER_BACKENDS: "gnocchi"
+        CEILOMETER_PIPELINE_INTERVAL: 15
+        CEILOMETER_ALARM_THRESHOLD: 6000000000
+        GLOBAL_VENV: False
+      devstack_local_conf:
+        test-config:
+          $TEMPEST_CONFIG:
+            service_available:
+              sg_core: False
+            telemetry_services:
+              metric_backends: gnocchi
+            telemetry:
+              disable_ssl_certificate_validation: True
+              ceilometer_polling_interval: 15
+
+- job:
+    name: telemetry-dsvm-integration-2023-1
+    parent: telemetry-tempest-base
+    override-checkout: stable/2023.1
+    vars: *no_prometheus_vars
+
 - job:
     name: telemetry-dsvm-integration
     parent: telemetry-tempest-base
@@ -141,7 +171,10 @@
     check:
       jobs:
         - telemetry-dsvm-integration
-        - telemetry-dsvm-integration-wallaby
+        - telemetry-dsvm-integration-2023-1
+        - telemetry-dsvm-integration-2023-2
+        - 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