From fb7221749b7f03043673f8a72f7ad3c31b52d083 Mon Sep 17 00:00:00 2001 From: Redouane Kachach Date: Wed, 31 Jan 2024 10:48:35 +0100 Subject: [PATCH] mgr/rook: adding deployment to ceph image built for rook e2e testing Fixes: https://tracker.ceph.com/issues/64266 Signed-off-by: Redouane Kachach --- src/pybind/mgr/rook/ci/Dockerfile | 1 + src/pybind/mgr/rook/ci/scripts/bootstrap-rook-cluster.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/src/pybind/mgr/rook/ci/Dockerfile b/src/pybind/mgr/rook/ci/Dockerfile index 30ebea5749c..a338188195a 100644 --- a/src/pybind/mgr/rook/ci/Dockerfile +++ b/src/pybind/mgr/rook/ci/Dockerfile @@ -1,3 +1,4 @@ FROM quay.io/ceph/daemon-base:latest-main COPY ./tmp_build/orchestrator /usr/share/ceph/mgr/orchestrator COPY ./tmp_build/rook /usr/share/ceph/mgr/rook +COPY ./tmp_build/ceph/ /usr/lib/python3.6/site-packages/ceph/ diff --git a/src/pybind/mgr/rook/ci/scripts/bootstrap-rook-cluster.sh b/src/pybind/mgr/rook/ci/scripts/bootstrap-rook-cluster.sh index dcd22fce9a7..24a6a5da23f 100755 --- a/src/pybind/mgr/rook/ci/scripts/bootstrap-rook-cluster.sh +++ b/src/pybind/mgr/rook/ci/scripts/bootstrap-rook-cluster.sh @@ -44,6 +44,7 @@ build_ceph_image() { mkdir -p tmp_build/orchestrator cp ./../../orchestrator/*.py tmp_build/orchestrator cp ../*.py tmp_build/rook + cp -r ../../../../../src/python-common/ceph/ tmp_build/ # we use the following tag to trick the Docker # running inside minikube so it uses this image instead -- 2.39.5