From: Duncan Bellamy <dunk@denkimushi.com>
Date: Sun, 5 Sep 2021 07:35:48 +0000 (+0100)
Subject: mgr/dashboard: use -f for npm ci to skip fsevents error
X-Git-Tag: v16.2.8~281^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0e18a7e8eb97ce6ca8c0a440cf0a9b1855180a2b;p=ceph.git

mgr/dashboard: use -f for npm ci to skip fsevents error
Fixes: https://tracker.ceph.com/issues/52507

Signed-off-by: Duncan Bellamy <dunk@denkimushi.com>
(cherry picked from commit cd2b26f653ddedf0ed1b937cfaf8bcf7aaf48ce6)

   Conflicts:
	src/pybind/mgr/dashboard/CMakeLists.txt
   - In master this file was moved to frontend folder. Since its not
     done in pacific, just made the changes here.
---

diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
index 9b3432213a016..0c8d46d65ee99 100644
--- a/src/pybind/mgr/dashboard/CMakeLists.txt
+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
@@ -76,7 +76,7 @@ endif(WITH_SYSTEM_NPM)
 
 add_npm_command(
   OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules"
-  COMMAND CYPRESS_CACHE_FOLDER=${CMAKE_SOURCE_DIR}/build/src/pybind/mgr/dashboard/cypress NG_CLI_ANALYTICS=false npm ci ${mgr-dashboard-userconfig}
+  COMMAND CYPRESS_CACHE_FOLDER=${CMAKE_SOURCE_DIR}/build/src/pybind/mgr/dashboard/cypress NG_CLI_ANALYTICS=false npm ci -f ${mgr-dashboard-userconfig}
   DEPENDS frontend/package.json
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
   COMMENT "dashboard frontend dependencies are being installed"