Add pack shared lib dir support to st2-run-pack-tests

StackStorm · Dec 18, 2024 · e9b7911 · e9b7911
1 parent ca9d850
commit e9b7911
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/st2common/bin/st2-run-pack-tests b/st2common/bin/st2-run-pack-tests
@@ -156,6 +156,7 @@ PACK_TESTS_PATH="${PACK_PATH}/tests/"
 SENSORS_PATH="${PACK_PATH}/sensors/"
 ACTIONS_PATH="${PACK_PATH}/actions/"
 ACTIONS_LIB_PATH="${PACK_PATH}/actions/lib/"
+PACK_SHARED_LIB_PATH="${PACK_PATH}/lib/"
 ETC_PATH="${PACK_PATH}/etc/"
 
 # Bail early if no tests are found, this way we don't need to wait for
@@ -223,12 +224,12 @@ if [ -n "${ST2_REPO_PATH}" ]; then
     ST2_REPO_PATH=${ST2_REPO_PATH:-/tmp/st2}
     ST2_COMPONENTS=$(find ${ST2_REPO_PATH}/* -maxdepth 0 -name "st2*" -type d)
     ST2_RUNNERS=$(find ${ST2_REPO_PATH}/contrib/runners/* -maxdepth 0 -type d 2> /dev/null)
-    PACK_PYTHONPATH="$(join ":" ${ST2_COMPONENTS}):$(join ":" ${ST2_RUNNERS}):${SENSORS_PATH}:${ACTIONS_PATH}:${ACTIONS_LIB_PATH}:${ETC_PATH}"
+    PACK_PYTHONPATH="${PACK_SHARED_LIB_PATH}:$(join ":" ${ST2_COMPONENTS}):$(join ":" ${ST2_RUNNERS}):${SENSORS_PATH}:${ACTIONS_PATH}:${ACTIONS_LIB_PATH}:${ETC_PATH}"
 else
     # ST2_REPO_PATH not provided, assume all the st2 component packages are
     # already in PYTHONPATH
     ST2_RUNNERS=$(find /opt/stackstorm/runners/* -maxdepth 0 -type d 2> /dev/null)
-    PACK_PYTHONPATH="$(join ":" ${ST2_COMPONENTS}):$(join ":" ${ST2_RUNNERS}):${SENSORS_PATH}:${ACTIONS_PATH}:${ACTIONS_LIB_PATH}:${ETC_PATH}"
+    PACK_PYTHONPATH="${PACK_SHARED_LIB_PATH}:$(join ":" ${ST2_COMPONENTS}):$(join ":" ${ST2_RUNNERS}):${SENSORS_PATH}:${ACTIONS_PATH}:${ACTIONS_LIB_PATH}:${ETC_PATH}"
 fi
 
 if [ "${JUST_TESTS}" = false ]; then
@@ -303,7 +304,7 @@ if [ -n "${TEST_LOCATION}" ]; then
     TESTS_PYTHON_PATH+=("${PACK_TESTS_PATH}")
 fi
 
-TESTS_PYTHON_PATH="$(join ":" ${TESTS_PYTHON_PATH[@]})"
+TESTS_PYTHON_PATH="$(join ":" ${TESTS_PYTHON_PATH[@]} | sed -e 's/:+/:/')"
 
 export PYTHONPATH="${TESTS_PYTHON_PATH}"