]>
Commit | Line | Data |
---|---|---|
f8bb146f JR |
1 | diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake |
2 | index d26d003c779..bc962e3aa73 100644 | |
3 | --- a/cmake/modules/AddCephTest.cmake | |
4 | +++ b/cmake/modules/AddCephTest.cmake | |
5 | @@ -70,14 +70,6 @@ function(add_tox_test name) | |
6 | endif() | |
7 | string(REPLACE ";" "," tox_envs "${tox_envs}") | |
8 | find_package(Python3 QUIET REQUIRED) | |
9 | - add_custom_command( | |
10 | - OUTPUT ${venv_path}/bin/activate | |
11 | - COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python="${Python3_EXECUTABLE}" ${venv_path} | |
12 | - WORKING_DIRECTORY ${tox_path} | |
13 | - COMMENT "preparing venv for ${name}") | |
14 | - add_custom_target(${name}-venv | |
15 | - DEPENDS ${venv_path}/bin/activate) | |
16 | - add_dependencies(tests ${name}-venv) | |
17 | add_test( | |
18 | NAME ${test_name} | |
19 | COMMAND ${CMAKE_SOURCE_DIR}/src/script/run_tox.sh | |
20 | diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt | |
21 | index 9166553dc73..9a6c87595b9 100644 | |
22 | --- a/src/ceph-volume/CMakeLists.txt | |
23 | +++ b/src/ceph-volume/CMakeLists.txt | |
24 | @@ -8,22 +8,6 @@ if(FREEBSD) | |
25 | add_subdirectory(plugin/zfs) | |
26 | endif() | |
27 | ||
28 | -# Required for running ceph-volume inventory in a vstart environment | |
29 | -set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv) | |
30 | - | |
31 | -add_custom_command( | |
32 | - OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python | |
33 | - COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python3_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV} | |
34 | - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume | |
35 | - COMMENT "ceph-volume venv is being created") | |
36 | - | |
37 | -add_custom_command( | |
38 | - OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume | |
39 | - DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python | |
40 | - COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate | |
41 | - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume | |
42 | - COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume") | |
43 | - | |
44 | add_custom_target(ceph-volume-venv-setup | |
45 | DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume) | |
46 | ||
47 | diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt | |
48 | index 9b3432213a0..973b185f5de 100644 | |
49 | --- a/src/pybind/mgr/dashboard/CMakeLists.txt | |
50 | +++ b/src/pybind/mgr/dashboard/CMakeLists.txt | |
51 | @@ -5,9 +5,6 @@ function(add_npm_command) | |
52 | set(multi_kw COMMAND DEPENDS) | |
53 | cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN}) | |
54 | string(REPLACE ";" " " command "${NC_COMMAND}") | |
55 | - if(NC_NODEENV) | |
56 | - string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command}) | |
57 | - endif() | |
58 | string(REPLACE " " ";" command "${command}") | |
59 | add_custom_command( | |
60 | OUTPUT "${NC_OUTPUT}" | |
61 | @@ -51,11 +48,8 @@ else(WITH_SYSTEM_NPM) | |
62 | set(node_mirror_opt "--mirror=$ENV{NODE_MIRROR}") | |
63 | endif() | |
64 | add_custom_command( | |
65 | - OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm" | |
66 | - COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir} | |
67 | - COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv | |
68 | - COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose ${node_mirror_opt} -p --node=12.18.2 | |
69 | - COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm | |
70 | + OUTPUT "/bin/npm" | |
71 | + COMMAND /bin/nodeenv ${node_mirror_opt} -p --node=12.18.2 | |
72 | WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} | |
73 | COMMENT "dashboard nodeenv is being installed" | |
74 | ) |