From 1ac5ffbe32a22c735b19d748d2c049cd0c5dc777 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Fri, 10 Mar 2023 14:33:30 +0100 Subject: [PATCH] ci-scripts: remove GITHUB_ACTIONS_WORKING_DIR from commons.sh --- ci-scripts/commons.sh | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/ci-scripts/commons.sh b/ci-scripts/commons.sh index 98e160b9..992d7c0d 100755 --- a/ci-scripts/commons.sh +++ b/ci-scripts/commons.sh @@ -7,11 +7,8 @@ set -eu -o pipefail ################################################################ # CI flags -GITHUB_ACTIONS_WORKING_DIR="${GITHUB_ACTIONS_WORKING_DIR:-}" - -PREPARE_TEST_ENVIRONMENT=false - CLEAN_ENVIRONMENT=false +PREPARE_TEST_ENVIRONMENT=false PREPARE_KURENTO_SNAPSHOT=false SERVE_OV_TESTAPP=false @@ -266,8 +263,7 @@ if [[ "${CLEAN_ENVIRONMENT}" == true ]]; then for id in $ids; do DOCKER_IMAGE=$(docker inspect --format='{{.Config.Image}}' $id) if [[ "${DOCKER_IMAGE}" != *"$TEST_IMAGE"* ]] && - [[ "${DOCKER_IMAGE}" != *"runner-deployment"* ]] && - [[ "${DOCKER_IMAGE}" != *"openvidu/openvidu-dev-generic"* ]]; then + [[ "${DOCKER_IMAGE}" != *"runner-deployment"* ]]; then echo "Removing container image '$DOCKER_IMAGE' with id '$id'" docker stop $id && docker rm $id fi @@ -276,11 +272,6 @@ if [[ "${CLEAN_ENVIRONMENT}" == true ]]; then # Clean /opt/openvidu contents rm -rf /opt/openvidu/* - # Recreate working dir just in case it was placed under /opt/openvidu - if [[ -n "${GITHUB_ACTIONS_WORKING_DIR:-}" ]]; then - mkdir -p "${GITHUB_ACTIONS_WORKING_DIR}" - fi - fi # -------------