]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
ceph-volume: Add venv to vstart cmake target
authorSebastian Wagner <sebastian.wagner@suse.com>
Mon, 10 Dec 2018 13:36:47 +0000 (14:36 +0100)
committerSebastian Wagner <sebastian.wagner@suse.com>
Thu, 20 Dec 2018 09:57:02 +0000 (10:57 +0100)
Adds new add_custom_target `ceph-volume-venv-setup`
that creates a virtual environment, and
calls `python setup.py develop`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
src/CMakeLists.txt
src/ceph-volume/CMakeLists.txt

index 6e729edb91c8f01c1f6ef94af54c15fa58e0edac..6d7a00afe463805d37189562bb66310f45910184 100644 (file)
@@ -756,6 +756,10 @@ if(WITH_MGR AND WITH_MGR_DASHBOARD_FRONTEND AND CMAKE_SYSTEM_PROCESSOR MATCHES "
   add_dependencies(vstart mgr-dashboard-frontend-build)
 endif()
 
+if(WITH_MGR)
+  add_dependencies(vstart ceph-volume-venv-setup)
+endif()
+
 # Everything you need to run CephFS tests
 add_custom_target(cephfs_testing DEPENDS
     vstart
index d49a9bfca34bde22b4885cc551d0fe2076e534b7..e09fdefe03c5cfcc359954eae777114ddf291f12 100644 (file)
@@ -7,3 +7,22 @@ if(FREEBSD)
   add_subdirectory(plugin/zfs)
 endif()
 
+# Required for running ceph-volume inventory in a vstart environment
+set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv)
+
+add_custom_command(
+  OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python
+  COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${PYTHON_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV}
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
+  COMMENT "ceph-volume venv is being created")
+
+add_custom_command(
+  OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume
+  DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python
+  COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
+  COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume")
+
+add_custom_target(ceph-volume-venv-setup
+  DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume)
+