From 2947b10f9f15aeda9aecc092943c26ccd8dc6f28 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 20 Feb 2023 14:52:53 -0700 Subject: [PATCH 1/2] teuth systemd --- ceph_devstack/resources/ceph/containers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ceph_devstack/resources/ceph/containers.py b/ceph_devstack/resources/ceph/containers.py index 34a40946..5456e433 100644 --- a/ceph_devstack/resources/ceph/containers.py +++ b/ceph_devstack/resources/ceph/containers.py @@ -329,6 +329,7 @@ def create_cmd(self): f"testnode_count={Config.args.testnode_count}", "--network", "ceph-devstack", + "--systemd=always", "--secret", "id_rsa", "-v", From 364a523278d41f1200539fb548edc512b9883267 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 20 Feb 2023 14:58:26 -0700 Subject: [PATCH 2/2] use conf file for doctor --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3d78af11..2897b7c6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,9 +36,9 @@ pipeline { python -V pip3 install -U pip pip3 install -e . - ceph-devstack doctor echo "data_dir: ${env.WORKSPACE}/data" > ${env.CDS_CONF} echo "teuthology_repo: ${env.WORKSPACE}/teuthology" >> ${env.CDS_CONF} + ceph-devstack --config-file ${env.CDS_CONF} doctor """ } }