mgr/rook: adding deployment to ceph image built for rook e2e testing

Fixes: https://tracker.ceph.com/issues/64266
Signed-off-by: Redouane Kachach <rkachach@redhat.com>

diff --git a/src/pybind/mgr/rook/ci/Dockerfile b/src/pybind/mgr/rook/ci/Dockerfile
index 30ebea5749c8a632eacbc5f57f4a2ab85d46e94d..a338188195ae9c4edf33d207418ccdba7d7a6061 100644 (file)
--- 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 dcd22fce9a75b47b812e8f15ff94c28ad12bbb6e..24a6a5da23f48386b29e38f0e09c51e627b35646 100755 (executable)
--- 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