Defining node-version in one place for all sandbox installation contexts

jimmyjayp · jimmyjayp · commit 81de1146359b · 2023-06-04T12:04:47.000-04:00
diff --git a/sandbox/configure-sandbox b/sandbox/configure-sandbox
@@ -25,7 +25,7 @@ abort_on_fail=1
 # environment is set
 
 cd $CSBE_TOP
-[ ! -d .git ] && echo "nothing to configure for a pre-built asset sandbox" && exit 0
+[ ! -d .git ] && echo "nothing to configure for a pre-built asset sandbox ($CSBE_TOP/.git not found)" && exit 0
 
 # Install git submodules
 [ -f .gitmodules ] && echo "Updating submodules" && git submodule update --init --recursive
diff --git a/sandbox/defaults.sh b/sandbox/defaults.sh
@@ -37,7 +37,7 @@ sandutil_load_options $CSBE_SANDBOX || { echo "failed to load options" >&2 && re
 # Uncomment and setup if node is required. Available versions can be seen
 # with the command:
 #   ssh $DT_CLOUD_SERVER ls /home/web/SandboxRepos/software/node-$DT_OS_TYPE-*
-export CSBE_NODE_VER=16.15.1
+export CSBE_NODE_VER=`cat $CSBE_TOP/sandbox/node-version`
 export PATH=$CSBE_SANDBOX/node/bin:$CSBE_TOP/node_modules/.bin:./node_modules/.bin:$PATH
 
 # Add $MY_SANDBOX/bin to the search path
diff --git a/sandbox/node-version b/sandbox/node-version
@@ -0,0 +1 @@
+16.15.1
diff --git a/sandbox/shared/sandbox_config.sh b/sandbox/shared/sandbox_config.sh
@@ -2,7 +2,7 @@
 # Common routines for codestream-server sandboxes
 
 # Defaults values
-[ -n "$CSBE_NODE_VER" ] && _defaultNodeVersion=$CSBE_NODE_VER || { _defaultNodeVersion=16.15.1 && echo "CSBE_NODE_VER not defined. THIS IS BAD"; }
+[ -n "$CSBE_NODE_VER" ] && _defaultNodeVersion=$CSBE_NODE_VER || _defaultNodeVersion=`cat $CSSVC_BACKEND_ROOT/sandbox/node-version`
 
 [ -z "$CSBE_API_DEFAULT_PORT" ] && export CSBE_API_DEFAULT_PORT=12079
 
@@ -85,6 +85,8 @@ function sbcfg_initialize {
 	export PATH=$sbTop/node_modules/.bin:$PATH
 	export NODE_PATH=$sbTop/node_modules:$NODE_PATH
 	export PATH=$sbTop/bin:$PATH
+	env | grep NODE_VER
+	env | grep REPO_ROOT
 
 	# ---- CORE VARIABLES
 	[ -z "$sbLogs" ] && sbcfg_set_var "${sbPrefix}_LOGS" $sbRoot/log
diff --git a/shared/codestream_configs/bin/update-all-configs b/shared/codestream_configs/bin/update-all-configs
@@ -16,7 +16,7 @@ default environment list: $environmentList
 
 if [ "$DT_RDB_WHICH" == "nrdev" ]; then
 	profiles="$DT_RESOURCES/codestream/config-profiles"
-	environmentList="local local1 local2 dev pd pd2 qa qa2 stg"
+	environmentList="local local1 local2 dev ci pi pd pd2 qa qa2 stg"
 	# environmentList="local local1 local2 pd pd2 qa qa2 ci pi stg"
 elif [ "$DT_RDB_WHICH" == "nrprod" ]; then
 	profiles="$DT_RESOURCES/codestream/config-profiles"
