From 181d6ba407ed634c7321d7d3d0a3c04b3fa70650 Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Sat, 10 Jun 2023 19:03:10 +0300
Subject: [PATCH] Move npm install to CI build and remove it from tests

---
 .gitea/workflows/test.Dockerfile | 3 +++
 tests/run_3osds.sh               | 3 ---
 tests/test_failure_domain.sh     | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitea/workflows/test.Dockerfile b/.gitea/workflows/test.Dockerfile
index 736daafe..3b769e50 100644
--- a/.gitea/workflows/test.Dockerfile
+++ b/.gitea/workflows/test.Dockerfile
@@ -10,6 +10,9 @@ RUN set -e -x; \
     ln -s /root/fio-build/fio-*/ ./fio; \
     ln -s /root/qemu-build/qemu-*/ ./qemu; \
     ls /usr/include/linux/raw.h || cp ./debian/raw.h /usr/include/linux/raw.h; \
+    cd mon; \
+    npm install; \
+    cd ..; \
     mkdir build; \
     cd build; \
     cmake .. -DWITH_ASAN=yes -DWITH_QEMU=yes; \
diff --git a/tests/run_3osds.sh b/tests/run_3osds.sh
index 1c190b77..e9ef2186 100644
--- a/tests/run_3osds.sh
+++ b/tests/run_3osds.sh
@@ -36,9 +36,6 @@ for i in $(seq 1 $OSD_COUNT); do
     start_osd $i
 done
 
-cd mon
-npm install
-cd ..
 (while true; do node mon/mon-main.js --etcd_url $ETCD_URL --etcd_prefix "/vitastor" --verbose 1 || true; done) &>./testdata/mon.log &
 MON_PID=$!
 
diff --git a/tests/test_failure_domain.sh b/tests/test_failure_domain.sh
index 8432b176..99f58c4a 100755
--- a/tests/test_failure_domain.sh
+++ b/tests/test_failure_domain.sh
@@ -15,9 +15,6 @@ $ETCDCTL put /vitastor/osd/stats/7 '{"host":"host4","size":1073741824,"time":"'$
 $ETCDCTL put /vitastor/osd/stats/8 '{"host":"host4","size":1073741824,"time":"'$TIME'"}'
 $ETCDCTL put /vitastor/config/pools '{"1":{"name":"testpool","scheme":"replicated","pg_size":2,"pg_minsize":1,"pg_count":4,"failure_domain":"rack"}}'
 
-cd mon
-npm install
-cd ..
 node mon/mon-main.js --etcd_url $ETCD_URL --etcd_prefix "/vitastor" &>./testdata/mon.log &
 MON_PID=$!