From 5927785d4533108ae299bdd7610951809513f4be Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Mon, 9 Dec 2024 17:01:43 +0100
Subject: [PATCH 1/2] CI: Switch to 2024-1 parent jobs

Change-Id: I1756ffac16058407669e8db6bf5d978998938952
---
 .zuul.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 45e52919e..6041eafda 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -51,7 +51,7 @@
 
 - job:
     name: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.27
-    parent: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1
+    parent: magnum-tempest-plugin-tests-cluster-2024-1
     vars:
       devstack_localrc:
         MAGNUM_KUBECTL_TAG: v1.27.8

From b47479272a5ea0fc4b0cc81fd51f1ef6f20ccc9a Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Fri, 29 Nov 2024 15:14:15 +0100
Subject: [PATCH 2/2] Fix sqlalchemy with osprofiler

Breakage seen in magnum-capi-helm unit tests after [1].

[1]: https://review.opendev.org/c/openstack/magnum/+/927446

Closes-Bug: #2089934

Change-Id: I3e5560dd487525d9566930772b0c56d52d974500
(cherry picked from commit ea2619f462281bea9d5304bcf6cbabfc1af2cfb8)
---
 magnum/db/sqlalchemy/api.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/magnum/db/sqlalchemy/api.py b/magnum/db/sqlalchemy/api.py
index 5b5f0ac45..05c93fe3c 100644
--- a/magnum/db/sqlalchemy/api.py
+++ b/magnum/db/sqlalchemy/api.py
@@ -64,7 +64,8 @@ def _session_for_write():
 
 
 def _wrap_session(session):
-    if CONF.profiler.enabled and CONF.profiler.trace_sqlalchemy:
+    if (hasattr(CONF, 'profiler') and CONF.profiler.enabled and
+       CONF.profiler.trace_sqlalchemy):
         session = profiler_sqlalchemy.wrap_session(sa, session)
     return session