From 8a5cd7b1cc2b066c5d8ef8f9d90c77d3bd17c151 Mon Sep 17 00:00:00 2001 From: Vallari Agrawal Date: Thu, 3 Jul 2025 13:10:41 +0530 Subject: [PATCH 1/2] Add TEUTHOLOGY_CONF to teuthology container Signed-off-by: Vallari Agrawal --- ceph_devstack/resources/ceph/containers.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ceph_devstack/resources/ceph/containers.py b/ceph_devstack/resources/ceph/containers.py index d6130fb2..f4cff6d8 100644 --- a/ceph_devstack/resources/ceph/containers.py +++ b/ceph_devstack/resources/ceph/containers.py @@ -341,6 +341,14 @@ def create_cmd(self): "-e", f"SSH_AUTH_SOCK={ssh_auth_socket}", ] + custom_conf = os.environ.get("TEUTHOLOGY_CONF") + if custom_conf: + cmd += [ + "-v", + f"{custom_conf}:/tmp/conf.yaml", + "-e", + f"TEUTHOLOGY_CONF=/tmp/conf.yaml", + ] cmd += [ "--name", "{name}", From fb3f22ba2a6845310fcf39a407e083a95bd63de8 Mon Sep 17 00:00:00 2001 From: Vallari Agrawal Date: Thu, 3 Jul 2025 16:55:17 +0530 Subject: [PATCH 2/2] Add TEUTHOLOGY_YAML to overwrite teuthology.yaml Overwrite tuethology.yaml in teuthology container. Signed-off-by: Vallari Agrawal --- ceph_devstack/resources/ceph/containers.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ceph_devstack/resources/ceph/containers.py b/ceph_devstack/resources/ceph/containers.py index f4cff6d8..758a73db 100644 --- a/ceph_devstack/resources/ceph/containers.py +++ b/ceph_devstack/resources/ceph/containers.py @@ -349,6 +349,12 @@ def create_cmd(self): "-e", f"TEUTHOLOGY_CONF=/tmp/conf.yaml", ] + teuthology_yaml = os.environ.get("TEUTHOLOGY_YAML") + if teuthology_yaml: + cmd += [ + "-v", + f"{teuthology_yaml}:/root/.teuthology.yaml", + ] cmd += [ "--name", "{name}",