You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
54 lines
2.3 KiB
54 lines
2.3 KiB
diff --git a/.gitignore b/.gitignore
|
|
index 2c2afc282e..80c05ee2f0 100644
|
|
--- a/.gitignore
|
|
+++ b/.gitignore
|
|
@@ -13,10 +13,8 @@
|
|
*.swp
|
|
*.swo
|
|
*.tmp
|
|
-*.orig
|
|
*.patch
|
|
!debian/patches/*.patch
|
|
-*.rej
|
|
*.rpm
|
|
*.pyc
|
|
ceph.spec
|
|
diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
|
|
index 24a2efc9e2..b11d4d0303 100644
|
|
--- a/src/pybind/mgr/dashboard/CMakeLists.txt
|
|
+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
|
|
@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
|
|
|
|
add_custom_target(mgr-dashboard-test-venv
|
|
COMMAND
|
|
- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
|
|
+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
|
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard
|
|
COMMENT "dashboard tests virtualenv is being created")
|
|
add_dependencies(tests mgr-dashboard-test-venv)
|
|
@@ -14,9 +14,9 @@ function(add_npm_command)
|
|
set(multi_kw COMMAND DEPENDS)
|
|
cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN})
|
|
string(REPLACE ";" " " command "${NC_COMMAND}")
|
|
- if(NC_NODEENV)
|
|
- string(REGEX REPLACE "^(npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
|
|
- endif()
|
|
+ #if(NC_NODEENV)
|
|
+ # string(REGEX REPLACE "^(npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
|
|
+ #endif()
|
|
string(REPLACE " " ";" command "${command}")
|
|
add_custom_command(
|
|
OUTPUT "${NC_OUTPUT}"
|
|
@@ -41,9 +41,9 @@ else()
|
|
|
|
add_custom_command(
|
|
OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
|
|
- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
|
|
- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
|
|
- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.13.0
|
|
+ #COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
|
|
+ #COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
|
|
+ #COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.13.0
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
|
COMMENT "dashboard nodeenv is being installed"
|
|
)
|