From dccebc7ca4c5fcf78b8e8e745e785a4f07386993 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 26 Sep 2024 20:03:34 -0400 Subject: script/ceph-debug-docker: drop /ceph mount We don't mount that anymore on dev playgrounds. Signed-off-by: Patrick Donnelly --- src/script/ceph-debug-docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script/ceph-debug-docker.sh b/src/script/ceph-debug-docker.sh index 76d3b126153..b21118ebd81 100755 --- a/src/script/ceph-debug-docker.sh +++ b/src/script/ceph-debug-docker.sh @@ -180,7 +180,7 @@ EOF printf "built image %s\n" "$tag" - run $SUDO docker run $PRIVILEGED -ti -v /ceph:/ceph:ro -v /cephfs:/cephfs:ro -v /teuthology:/teuthology:ro "$tag" + run $SUDO docker run $PRIVILEGED -ti -v /teuthology:/teuthology:ro "$tag" return 0 } -- cgit v1.2.3 From 4b2e841144e31c7136e6d9b0e6dfbb73040709e2 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 26 Sep 2024 20:08:54 -0400 Subject: script/ceph-debug-docker: add debuginfod for ubuntu This apparently lets us download debug symbols by build id in the core file. Signed-off-by: Patrick Donnelly --- src/script/ceph-debug-docker.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/script/ceph-debug-docker.sh b/src/script/ceph-debug-docker.sh index b21118ebd81..c3edc5df76d 100755 --- a/src/script/ceph-debug-docker.sh +++ b/src/script/ceph-debug-docker.sh @@ -117,13 +117,15 @@ FROM ${env} WORKDIR /root RUN apt-get update --yes --quiet && \ - apt-get install --yes --quiet screen gdb software-properties-common apt-transport-https curl + apt-get install --yes --quiet screen gdb software-properties-common apt-transport-https curl debuginfod ubuntu-dbgsym-keyring COPY cephdev.asc cephdev.asc RUN apt-key add cephdev.asc && \ curl -L $repo_url | tee /etc/apt/sources.list.d/ceph_dev.list && \ cat /etc/apt/sources.list.d/ceph_dev.list|sed -e 's/^deb/deb-src/' >>/etc/apt/sources.list.d/ceph_dev.list && \ apt-get update --yes && \ - DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get --assume-yes -q --no-install-recommends install -o Dpkg::Options::=--force-confnew --allow-unauthenticated ceph ceph-osd-dbg ceph-mds-dbg ceph-mgr-dbg ceph-mon-dbg ceph-common-dbg ceph-fuse-dbg ceph-test-dbg radosgw-dbg python3-cephfs python3-rados + DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get --assume-yes -q --no-install-recommends install -o Dpkg::Options::=--force-confnew --allow-unauthenticated ceph ceph-osd-dbg ceph-mds-dbg ceph-mgr-dbg ceph-mon-dbg ceph-common-dbg ceph-fuse-dbg ceph-test-dbg radosgw-dbg python3-cephfs python3-rados ; \ + printf 'set debuginfod enabled on\n' | tee -a ~/.gdbinit +ENV DEBUGINFOD_URLS="https://debuginfod.ubuntu.com" EOF time run $SUDO docker build $CACHE --tag "$tag" . else -- cgit v1.2.3