From 378f6ea2ca4fb8f37fc9f851d36e1e10157bb125 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Thu, 9 Mar 2023 19:13:25 +0100 Subject: [PATCH] ci-scripts: reorder openvidu-e2e-tests.sh methods --- ci-scripts/openvidu-e2e-tests.sh | 46 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/ci-scripts/openvidu-e2e-tests.sh b/ci-scripts/openvidu-e2e-tests.sh index 3252bc5e..637c37f0 100755 --- a/ci-scripts/openvidu-e2e-tests.sh +++ b/ci-scripts/openvidu-e2e-tests.sh @@ -1,14 +1,14 @@ #!/bin/bash -x set -eu -o pipefail -# Ci flags OV_INTEGRATION_TESTS=false OV_UNIT_TESTS=false -LAUNCH_OV_KURENTO=false OV_E2E_KURENTO=false -LAUNCH_OV_MEDIASOUP=false OV_E2E_MEDIASOUP=false +LAUNCH_OV_KURENTO=false +LAUNCH_OV_MEDIASOUP=false + function environmentLaunch { local MEDIA_SERVER="$1" @@ -167,18 +167,18 @@ if [[ -n ${1:-} ]]; then --openvidu-server-integration-tests) OV_INTEGRATION_TESTS=true ;; - --environment-launch-kurento) - LAUNCH_OV_KURENTO=true - ;; --openvidu-e2e-tests-kurento) OV_E2E_KURENTO=true ;; - --environment-launch-mediasoup) - LAUNCH_OV_MEDIASOUP=true - ;; --openvidu-e2e-tests-mediasoup) OV_E2E_MEDIASOUP=true ;; + --environment-launch-kurento) + LAUNCH_OV_KURENTO=true + ;; + --environment-launch-mediasoup) + LAUNCH_OV_MEDIASOUP=true + ;; *) echo "Unrecognized method $1" exit 1 @@ -207,13 +207,6 @@ if [[ "${OV_INTEGRATION_TESTS}" == true ]]; then popd fi -# ------------- -# Environment launch Kurento -# ------------- -if [[ "${LAUNCH_OV_KURENTO}" == true ]]; then - environmentLaunch "kurento" -fi - # ------------- # OpenVidu E2E Tests Kurento # ------------- @@ -221,16 +214,23 @@ if [[ "${OV_E2E_KURENTO}" == true ]]; then openviduE2ETests "kurento" fi -# ------------- -# Environment launch mediasoup -# ------------- -if [[ "${LAUNCH_OV_MEDIASOUP}" == true ]]; then - environmentLaunch "mediasoup" -fi - # ------------- # OpenVidu E2E Tests mediasoup # ------------- if [[ "${OV_E2E_MEDIASOUP}" == true ]]; then openviduE2ETests "mediasoup" fi + +# ------------- +# Environment launch Kurento +# ------------- +if [[ "${LAUNCH_OV_KURENTO}" == true ]]; then + environmentLaunch "kurento" +fi + +# ------------- +# Environment launch mediasoup +# ------------- +if [[ "${LAUNCH_OV_MEDIASOUP}" == true ]]; then + environmentLaunch "mediasoup" +fi \ No newline at end of file