(CI) update to new TUE_ENV_* vars (#40)

Author: MatthijsBurgh

.ci/get_install_build_packages.py

@@ -10,8 +10,13 @@
 else:
     skip_pkgs = set()
 
-system_dir = os.getenv("TUE_SYSTEM_DIR")
-packages = (f.path for f in os.scandir(os.path.join(system_dir, "src")) if f.is_dir())
+# TODO(anyone): remove try...except when tue-env is updated to new variable names
+try:
+    ws_dir = os.environ["TUE_ENV_WS_DIR"]
+except KeyError:
+    ws_dir = os.environ["TUE_WS_DIR"]
+
+packages = (f.path for f in os.scandir(os.path.join(ws_dir, "src")) if f.is_dir())
 
 install_build_pkgs = set()  # All packages that need to be build and require all deps to be installed
 build_pkgs = set()  # All packages that need to be build

.ci/install.bash

@@ -122,8 +122,9 @@ docker exec tue-env bash -c "source ~/.bashrc; tue-get install ros-python_orocos
 
 if [ -n "${SKIPLIST}" ]
 then
-    echo -e '\e[35m\e[1mcatkin config --workspace ${TUE_SYSTEM_DIR} --skiplist '"${SKIPLIST}"'\e[0m'
-    docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace ${TUE_SYSTEM_DIR} --skiplist '"${SKIPLIST}"
+    echo -e '\e[35m\e[1mcatkin config --workspace ${TUE_ENV_WS_DIR} --skiplist '"${SKIPLIST}"'\e[0m'
+    # TODO(anyone): remove variable logic when tue-env is updated to new variable names
+    docker exec -t tue-env bash -c 'source ~/.bashrc; [[ -v TUE_ENV_WS_DIR || ! -v TUE_WS_DIR ]] || TUE_ENV_WS_DIR=${TUE_WS_DIR}; catkin config --workspace ${TUE_ENV_WS_DIR} --skiplist '"${SKIPLIST}"
 fi
 
 echo -e "\e[35m\e[1mtue-make --no-status -DCATKIN_ENABLE_TESTING=OFF python_orocos_kdl" "${INSTALL_BUILD_PKGS[*]}" "${BUILD_PKGS[*]}" "\e[0m"
@@ -132,8 +133,9 @@ docker exec -t tue-env bash -c "source ~/.bashrc; tue-make --no-status -DCATKIN_
 
 if [ -n "${SKIPLIST}" ]
 then
-    echo -e '\e[35m\e[1mcatkin config --workspace ${TUE_SYSTEM_DIR} --no-skiplist\e[0m'
-    docker exec -t tue-env bash -c 'source ~/.bashrc; catkin config --workspace ${TUE_SYSTEM_DIR} --no-skiplist' # Clear skiplist
+    echo -e '\e[35m\e[1mcatkin config --workspace ${TUE_ENV_WS_DIR} --no-skiplist\e[0m'
+    # TODO(anyone): remove variable logic when tue-env is updated to new variable names
+    docker exec -t tue-env bash -c 'source ~/.bashrc; [[ -v TUE_ENV_WS_DIR || ! -v TUE_WS_DIR ]] || TUE_ENV_WS_DIR=${TUE_WS_DIR}; catkin config --workspace ${TUE_ENV_WS_DIR} --no-skiplist' # Clear skiplist
 fi
 
 # Allow everyone to read ~/.cache/pip folder for caching inside CI pipelines

.ci/pre_deploy.bash

@@ -19,7 +19,8 @@ do
     shift
 done
 
-TUE_SYSTEM_DIR=$(docker exec -t tue-env bash -c 'source ~/.bashrc; echo "${TUE_SYSTEM_DIR}"' | tr -d '\r')
+# TODO(anyone): remove variable logic when tue-env is updated to new variable names
+TUE_ENV_WS_DIR=$(docker exec -t tue-env bash -c 'source ~/.bashrc; [[ -v TUE_ENV_WS_DIR || ! -v TUE_WS_DIR ]] || TUE_ENV_WS_DIR=${TUE_WS_DIR}; echo "${TUE_ENV_WS_DIR}"' | tr -d '\r')
 
-echo -e "\e[35m\e[1mdocker cp tue-env:${TUE_SYSTEM_DIR}/docs .\e[0m"
-docker cp tue-env:"${TUE_SYSTEM_DIR}"/docs .
+echo -e "\e[35m\e[1mdocker cp tue-env:${TUE_ENV_WS_DIR}/docs .\e[0m"
+docker cp tue-env:"${TUE_ENV_WS_DIR}"/docs .