From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 11 Jul 2019 14:07:23 +0000 (+0200)
Subject: build/ops: run "npm ci" with a one-hour timeout
X-Git-Tag: v15.1.0~2191^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F28994%2Fhead;p=ceph.git

build/ops: run "npm ci" with a one-hour timeout

Fixes: https://tracker.ceph.com/issues/40645
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/make-dist b/make-dist
index 64280dd7eb8e..abbda64cef44 100755
--- a/make-dist
+++ b/make-dist
@@ -90,7 +90,7 @@ build_dashboard_frontend() {
   $TEMP_DIR/bin/nodeenv -p --node=10.13.0
   cd src/pybind/mgr/dashboard/frontend
   . $TEMP_DIR/bin/activate
-  npm ci
+  timeout 1h npm ci
   npm run build -- --prod --progress=false
   deactivate
   cd $CURR_DIR
diff --git a/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh b/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
index 87a1e6b4697b..9fbb5c44c1ce 100755
--- a/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
+++ b/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
@@ -63,7 +63,7 @@ cd $DASH_DIR/frontend
 jq .[].target=$BASE_URL proxy.conf.json.sample > proxy.conf.json
 
 . $BUILD_DIR/src/pybind/mgr/dashboard/node-env/bin/activate
-npm ci
+timeout 1h npm ci
 
 if [ $DEVICE == "chrome" ]; then
     npm run e2e || stop 1