mgr/dashboard: disable ibm telemetry on CI env

looks like ibm telemetry is being run when you do `npm install` on CI
env. here's disabling that

Signed-off-by: Nizamudeen A <nia@redhat.com>

diff --git a/make-dist b/make-dist
index b94e1021fbb11eee241a1df8731b5aa1d5b5b386..877c28d0c46485e7862d1ff3cd1f5ed367961354 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -137,7 +137,7 @@ build_dashboard_frontend() {
   cd src/pybind/mgr/dashboard/frontend
 
   . $TEMP_DIR/bin/activate
-  NG_CLI_ANALYTICS=false timeout 1h npm ci
+  NG_CLI_ANALYTICS=false IBM_TELEMETRY_DISABLED=true timeout 1h npm ci
   echo "Building ceph-dashboard frontend with build:localize script";
   # we need to use "--" because so that "--configuration production"
   # survives accross all scripts redirections inside package.json

diff --git a/qa/workunits/cephadm/test_dashboard_e2e.sh b/qa/workunits/cephadm/test_dashboard_e2e.sh
index 13746ec6de1afa70ba6454603ddfcc5a15d29bf0..c565643c481963c36d49cdcb594b1875ec7d6fb5 100755 (executable)
--- a/qa/workunits/cephadm/test_dashboard_e2e.sh
+++ b/qa/workunits/cephadm/test_dashboard_e2e.sh
@@ -76,6 +76,7 @@ CYPRESS_BASE_URL=$(ceph mgr services | jq -r .dashboard)
 export CYPRESS_BASE_URL
 
 cd $DASHBOARD_FRONTEND_DIR
+export IBM_TELEMETRY_DISABLED=true
 
 # This is required for Cypress to understand typescript
 npm ci --unsafe-perm

diff --git a/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh b/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh
index 784f24d2876dcfc92fae3e1fa69ab83773ae9bee..f7159fd38420f954006e603608c192d512b98a9f 100755 (executable)
--- a/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh
+++ b/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh
@@ -49,6 +49,7 @@ with_libvirt "kcli delete plan -y ceph || true"
 # Build dashboard frontend (required to start the module).
 cd ${CEPH_DEV_FOLDER}/src/pybind/mgr/dashboard/frontend
 export NG_CLI_ANALYTICS=false
+export IBM_TELEMETRY_DISABLED=true
 if [[ -n "$JENKINS_HOME" ]]; then
     npm cache clean --force
 fi

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