From 2fc3646ac5ce2a58307c0ea2c6d9a99033829a43 Mon Sep 17 00:00:00 2001
From: Jaromir Wysoglad <jwysogla@redhat.com>
Date: Wed, 9 Apr 2025 07:57:49 -0400
Subject: [PATCH] Fix observabilityclient-dsvm-functional job

There were some changes to the sg-core devstack plugin, to
which we need to react. These changes are similar to what
was done in the telemetry-tempest-plugin recently:
https://review.opendev.org/c/openstack/telemetry-tempest-plugin/+/945108
https://review.opendev.org/c/openstack/telemetry-tempest-plugin/+/937371

Change-Id: I5c1885a3ca9d732d41db140a0feb4c87925b5a48
---
 .zuul.yaml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index d26f572..afc9cc6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -8,16 +8,26 @@
     required-projects:
       - openstack/python-observabilityclient
       - openstack/ceilometer
-      - infrawatch/sg-core
+      - openstack-k8s-operators/sg-core
+      - openstack/devstack-plugin-prometheus
     timeout: 4200
     vars:
       devstack_localrc:
         USE_PYTHON3: True
         PROMETHEUS_SERVICE_SCRAPE_TARGETS: prometheus,sg-core
         CEILOMETER_BACKEND: sg-core
+        PROMETHEUS_CONF_DIR: /opt/stack
+        PROMETHEUS_CONFIG_FILE: /opt/stack/prometheus.yml
+        PROMETHEUS_CLIENT_CONF_DIR: /etc/openstack
       devstack_plugins:
-        sg-core: https://github.com/infrawatch/sg-core
+        sg-core: https://github.com/openstack-k8s-operators/sg-core
         ceilometer: https://opendev.org/openstack/ceilometer
+        devstack-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus
+      devstack_services:
+        node_exporter: false
+      zuul_copy_output:
+        /etc/prometheus/prometheus.yml: logs
+        /etc/openstack/prometheus.yaml: logs
 
 - project:
     queue: telemetry