no-virtualenvs.patch

   1 --- a/cmake/modules/AddCephTest.cmake
   2 +++ b/cmake/modules/AddCephTest.cmake
   3 @@ -70,17 +70,6 @@ function(add_tox_test name)
   4    endif()
   5    string(REPLACE ";" "," tox_envs "${tox_envs}")
   6    add_test(
   7 -    NAME setup-venv-for-${name}
   8 -    COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python3_EXECUTABLE} ${venv_path}
   9 -    WORKING_DIRECTORY ${tox_path})
  10 -  set_tests_properties(setup-venv-for-${name} PROPERTIES
  11 -    FIXTURES_SETUP venv-for-${name})
  12 -  add_test(
  13 -    NAME teardown-venv-for-${name}
  14 -    COMMAND ${CMAKE_COMMAND} -E remove_directory ${venv_path})
  15 -  set_tests_properties(teardown-venv-for-${name} PROPERTIES
  16 -    FIXTURES_CLEANUP venv-for-${name})
  17 -  add_test(
  18      NAME ${test_name}
  19      COMMAND ${CMAKE_SOURCE_DIR}/src/script/run_tox.sh
  20                --source-dir ${CMAKE_SOURCE_DIR}
  21 @@ -88,8 +77,7 @@ function(add_tox_test name)
  22                --tox-path ${tox_path}
  23                --tox-envs ${tox_envs}
  24                --venv-path ${venv_path})
  25 -  set_tests_properties(${test_name} PROPERTIES
  26 -    FIXTURES_REQUIRED venv-for-${name})
  27 +  set_tests_properties(${test_name} PROPERTIES)
  28    set_property(
  29      TEST ${test_name}
  30      PROPERTY ENVIRONMENT
  31 diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt
  32 index 9166553dc73..9a6c87595b9 100644
  33 --- a/src/ceph-volume/CMakeLists.txt
  34 +++ b/src/ceph-volume/CMakeLists.txt
  35 @@ -8,22 +8,6 @@ if(FREEBSD)
  36    add_subdirectory(plugin/zfs)
  37  endif()
  38
  39 -# Required for running ceph-volume inventory in a vstart environment
  40 -set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv)
  41 -
  42 -add_custom_command(
  43 -  OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python
  44 -  COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python3_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV}
  45 -  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
  46 -  COMMENT "ceph-volume venv is being created")
  47 -
  48 -add_custom_command(
  49 -  OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume
  50 -  DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python
  51 -  COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate
  52 -  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
  53 -  COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume")
  54 -
  55  add_custom_target(ceph-volume-venv-setup
  56    DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume)
  57
  58 --- ceph-17.2.6/src/pybind/mgr/dashboard/frontend/CMakeLists.txt.orig   2023-04-05 17:09:51.000000000 +0200
  59 +++ ceph-17.2.6/src/pybind/mgr/dashboard/frontend/CMakeLists.txt        2023-07-23 18:16:30.189120508 +0200
  60 @@ -5,17 +5,10 @@ function(add_npm_command)
  61    set(multi_kw COMMAND DEPENDS)
  62    cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN})
  63    string(REPLACE ";" " " command "${NC_COMMAND}")
  64 -  if(NC_NODEENV)
  65 -    string(REGEX REPLACE
  66 -      "^(([^ ]+=[^ ]+ )*npm .*)$"
  67 -      ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate"
  68 -      command ${command})
  69 -  else()
  70      string(REGEX REPLACE
  71        "^([^ ]=[^ ] )*npm (.*)$"
  72        "\\1${NPM_EXECUTABLE} \\2"
  73        command ${command})
  74 -  endif()
  75    string(REPLACE " " ";" command "${command}")
  76    add_custom_command(
  77      OUTPUT "${NC_OUTPUT}"
  78 @@ -36,9 +29,7 @@ function(add_npm_options)
  79      list(GET opt 1 value)
  80      list(APPEND commands
  81        COMMAND
  82 -      . ${NC_NODEENV_DIR}/bin/activate &&
  83 -      npm config set ${key} ${value} --userconfig ${NC_NODEENV_DIR}/.npmrc &&
  84 -      deactivate)
  85 +      npm config set ${key} ${value} --userconfig ${NC_NODEENV_DIR}/.npmrc
  86    endforeach()
  87    add_custom_target(${NC_TARGET}
  88      ${commands}
  89 @@ -60,11 +51,8 @@ else(WITH_SYSTEM_NPM)
  90      set(node_mirror_opt "--mirror=$ENV{NODE_MIRROR}")
  91    endif()
  92    add_custom_command(
  93 -    OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
  94 -    COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
  95 -    COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
  96 -    COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose ${node_mirror_opt} -p --node=14.15.1
  97 -    COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm
  98 +    OUTPUT "/bin/npm"
  99 +    COMMAND /bin/nodeenv --verbose ${node_mirror_opt} -p --node=14.15.1
 100      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 101      COMMENT "dashboard nodeenv is being installed")
 102    if(DEFINED ENV{NPM_REGISTRY})