ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ci-scripts: remove unnecessary "shift 1" command

pull/780/head
pabloFuente 2023-03-09 13:11:21 +01:00
parent fa1d33163b
commit 794c16ae6d
2 changed files with 51 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ci-scripts/commons.sh
View File

@ -53,7 +53,6 @@ if [[ -n ${1:-} ]]; then
--clean-environment) --clean-environment)
CLEAN_ENVIRONMENT=true CLEAN_ENVIRONMENT=true
shift 1
;; ;;
--prepare-test-environment) --prepare-test-environment)
@ -61,67 +60,54 @@ if [[ -n ${1:-} ]]; then
if [[ -n "${2:-}" ]]; then if [[ -n "${2:-}" ]]; then
TEST_IMAGE="${2}" TEST_IMAGE="${2}"
fi fi
shift 1
;; ;;
--prepare-kurento-snapshot) --prepare-kurento-snapshot)
PREPARE_KURENTO_SNAPSHOT=true PREPARE_KURENTO_SNAPSHOT=true
shift 1
;; ;;
--build-openvidu-browser) --build-openvidu-browser)
BUILD_OV_BROWSER=true BUILD_OV_BROWSER=true
shift 1
;; ;;
--build-openvidu-node-client) --build-openvidu-node-client)
BUILD_OV_NODE_CLIENT=true BUILD_OV_NODE_CLIENT=true
shift 1
;; ;;
--build-openvidu-java-client) --build-openvidu-java-client)
BUILD_OV_JAVA_CLIENT=true BUILD_OV_JAVA_CLIENT=true
shift 1
;; ;;
--build-openvidu-parent) --build-openvidu-parent)
BUILD_OV_PARENT=true BUILD_OV_PARENT=true
shift 1
;; ;;
--build-openvidu-testapp) --build-openvidu-testapp)
BUILD_OV_TESTAPP=true BUILD_OV_TESTAPP=true
shift 1
;; ;;
--build-openvidu-server-dashboard) --build-openvidu-server-dashboard)
BUILD_OV_SERVER_DASHBOARD=true BUILD_OV_SERVER_DASHBOARD=true
shift 1
;; ;;
--build-openvidu-server) --build-openvidu-server)
BUILD_OV_SERVER=true BUILD_OV_SERVER=true
shift 1
;; ;;
--build-openvidu-server-dependency) --build-openvidu-server-dependency)
BUILD_OV_SERVER_DEPENDENCY=true BUILD_OV_SERVER_DEPENDENCY=true
shift 1
;; ;;
--build-openvidu-server-pro-inspector) --build-openvidu-server-pro-inspector)
BUILD_OV_SERVER_PRO_INSPECTOR=true BUILD_OV_SERVER_PRO_INSPECTOR=true
shift 1
;; ;;
--build-openvidu-server-pro) --build-openvidu-server-pro)
BUILD_OV_SERVER_PRO=true BUILD_OV_SERVER_PRO=true
shift 1
;; ;;
--serve-openvidu-testapp) --serve-openvidu-testapp)
SERVE_OV_TESTAPP=true SERVE_OV_TESTAPP=true
shift 1
;; ;;
--bump-npm-project-version) --bump-npm-project-version)
@ -131,7 +117,6 @@ if [[ -n ${1:-} ]]; then
fi fi
BUMP_NPM_PROJECT_VERSION=true BUMP_NPM_PROJECT_VERSION=true
VERSION="${2}" VERSION="${2}"
shift 1
;; ;;
--bump-npm-dependency-version) --bump-npm-dependency-version)
@ -146,7 +131,6 @@ if [[ -n ${1:-} ]]; then
BUMP_NPM_DEPENDENCY_VERSION=true BUMP_NPM_DEPENDENCY_VERSION=true
DEPENDENCY="${2}" DEPENDENCY="${2}"
VERSION="${3}" VERSION="${3}"
shift 1
;; ;;
--bump-maven-project-version) --bump-maven-project-version)
@ -156,7 +140,6 @@ if [[ -n ${1:-} ]]; then
fi fi
BUMP_MAVEN_PROJECT_VERSION=true BUMP_MAVEN_PROJECT_VERSION=true
VERSION="${2}" VERSION="${2}"
shift 1
;; ;;
--bump-maven-property-version) --bump-maven-property-version)
@ -171,7 +154,6 @@ if [[ -n ${1:-} ]]; then
BUMP_MAVEN_PROPERTY_VERSION=true BUMP_MAVEN_PROPERTY_VERSION=true
PROPERTY="${2}" PROPERTY="${2}"
VERSION="${3}" VERSION="${3}"
shift 1
;; ;;
--bump-docker-compose-service-version) --bump-docker-compose-service-version)
@ -191,7 +173,6 @@ if [[ -n ${1:-} ]]; then
DOCKER_COMPOSE_FILE="${2}" DOCKER_COMPOSE_FILE="${2}"
SERVICE_IMAGE="${3}" SERVICE_IMAGE="${3}"
VERSION="${4}" VERSION="${4}"
shift 1
;; ;;
--bump-docker-compose-header-version) --bump-docker-compose-header-version)
@ -211,7 +192,6 @@ if [[ -n ${1:-} ]]; then
DOCKER_COMPOSE_FILE="${2}" DOCKER_COMPOSE_FILE="${2}"
HEADER="${3}" HEADER="${3}"
VERSION="${4}" VERSION="${4}"
shift 1
;; ;;
--bump-docker-image-version-in-files) --bump-docker-image-version-in-files)
@ -231,7 +211,6 @@ if [[ -n ${1:-} ]]; then
FILE_NAME_PATTERN="${2}" FILE_NAME_PATTERN="${2}"
IMAGE="${3}" IMAGE="${3}"
VERSION="${4}" VERSION="${4}"
shift 1
;; ;;
--bump-application-properties-var-value) --bump-application-properties-var-value)
@ -251,7 +230,6 @@ if [[ -n ${1:-} ]]; then
APPLICATION_PROPERTIES_FILE="${2}" APPLICATION_PROPERTIES_FILE="${2}"
VARIABLE="${3}" VARIABLE="${3}"
VALUE="${4}" VALUE="${4}"
shift 1
;; ;;
--wait-for-npm-dependency) --wait-for-npm-dependency)
@ -266,7 +244,6 @@ if [[ -n ${1:-} ]]; then
WAIT_FOR_NPM_DEPENDENCY=true WAIT_FOR_NPM_DEPENDENCY=true
DEPENDENCY="${2}" DEPENDENCY="${2}"
VERSION="${3}" VERSION="${3}"
shift 1
;; ;;
*) *)
echo "Unrecognized method $1" echo "Unrecognized method $1"

105
ci-scripts/openvidu-e2e-tests.sh
View File

@ -15,7 +15,7 @@ function environmentLaunch {
# Get e2e container id # Get e2e container id
local E2E_CONTAINER_ID local E2E_CONTAINER_ID
E2E_CONTAINER_ID="$(docker ps | grep 'openvidu/openvidu-test-e2e:*' | awk '{ print $1 }')" E2E_CONTAINER_ID="$(docker ps | grep 'openvidu/openvidu-test-e2e:*' | awk '{ print $1 }')"
# Get e2e container IP so services running can be accessed by browser and media server containers # Get e2e container IP so services running can be accessed by browser and media server containers
local E2E_CONTAINER_IP local E2E_CONTAINER_IP
@ -29,14 +29,14 @@ function environmentLaunch {
docker run -e KMS_UID=$(id -u) --network=host --detach=true --volume=/opt/openvidu/recordings:/opt/openvidu/recordings "${KURENTO_MEDIA_SERVER_IMAGE}" docker run -e KMS_UID=$(id -u) --network=host --detach=true --volume=/opt/openvidu/recordings:/opt/openvidu/recordings "${KURENTO_MEDIA_SERVER_IMAGE}"
while true; do while true; do
RC="$(curl \ RC="$(curl \
--silent \ --silent \
--no-buffer \ --no-buffer \
--write-out '%{http_code}' \ --write-out '%{http_code}' \
--header "Connection: Upgrade" \ --header "Connection: Upgrade" \
--header "Upgrade: websocket" \ --header "Upgrade: websocket" \
--header "Host: ${DOCKER_HOST_IP}" \ --header "Host: ${DOCKER_HOST_IP}" \
--header "Origin: ${DOCKER_HOST_IP}" \ --header "Origin: ${DOCKER_HOST_IP}" \
"http://${DOCKER_HOST_IP}:8888/kurento" || echo '')" "http://${DOCKER_HOST_IP}:8888/kurento" || echo '')"
if [[ "$RC" == "500" ]]; then if [[ "$RC" == "500" ]]; then
break break
@ -55,7 +55,10 @@ function environmentLaunch {
--env=WEBRTC_LISTENIPS_0_IP="${DOCKER_HOST_IP}" \ --env=WEBRTC_LISTENIPS_0_IP="${DOCKER_HOST_IP}" \
--volume=/opt/openvidu/recordings:/opt/openvidu/recordings \ --volume=/opt/openvidu/recordings:/opt/openvidu/recordings \
openvidu/mediasoup-controller:"${MEDIASOUP_CONTROLLER_VERSION}" openvidu/mediasoup-controller:"${MEDIASOUP_CONTROLLER_VERSION}"
until $(curl --insecure --output /dev/null --silent http://${DOCKER_HOST_IP}:8888/kurento); do echo "Waiting for ${MEDIA_SERVER}..."; sleep 1; done until $(curl --insecure --output /dev/null --silent http://${DOCKER_HOST_IP}:8888/kurento); do
echo "Waiting for ${MEDIA_SERVER}..."
sleep 1
done
else else
echo "Not valid media server" echo "Not valid media server"
exit 1 exit 1
@ -69,7 +72,7 @@ function environmentLaunch {
-DOPENVIDU_RECORDING_CUSTOM_LAYOUT=/opt/openvidu/test-layouts \ -DOPENVIDU_RECORDING_CUSTOM_LAYOUT=/opt/openvidu/test-layouts \
-DOPENVIDU_RECORDING_VERSION="${DOCKER_RECORDING_VERSION}" -DOPENVIDU_WEBHOOK=true \ -DOPENVIDU_RECORDING_VERSION="${DOCKER_RECORDING_VERSION}" -DOPENVIDU_WEBHOOK=true \
-DOPENVIDU_WEBHOOK_ENDPOINT=http://127.0.0.1:7777/webhook \ -DOPENVIDU_WEBHOOK_ENDPOINT=http://127.0.0.1:7777/webhook \
/opt/openvidu/openvidu-server-*.jar &> /opt/openvidu/openvidu-server-"${MEDIA_SERVER}".log & /opt/openvidu/openvidu-server-*.jar &>/opt/openvidu/openvidu-server-"${MEDIA_SERVER}".log &
else else
echo "Using default openvidu-recording tag" echo "Using default openvidu-recording tag"
java -jar -DKMS_URIS="[\"ws://${DOCKER_HOST_IP}:8888/kurento\"]" \ java -jar -DKMS_URIS="[\"ws://${DOCKER_HOST_IP}:8888/kurento\"]" \
@ -77,9 +80,12 @@ function environmentLaunch {
-DOPENVIDU_SECRET=MY_SECRET -DHTTPS_PORT=4443 -DOPENVIDU_RECORDING=true \ -DOPENVIDU_SECRET=MY_SECRET -DHTTPS_PORT=4443 -DOPENVIDU_RECORDING=true \
-DOPENVIDU_RECORDING_CUSTOM_LAYOUT=/opt/openvidu/test-layouts -DOPENVIDU_WEBHOOK=true \ -DOPENVIDU_RECORDING_CUSTOM_LAYOUT=/opt/openvidu/test-layouts -DOPENVIDU_WEBHOOK=true \
-DOPENVIDU_WEBHOOK_ENDPOINT=http://127.0.0.1:7777/webhook \ -DOPENVIDU_WEBHOOK_ENDPOINT=http://127.0.0.1:7777/webhook \
/opt/openvidu/openvidu-server-*.jar &> /opt/openvidu/openvidu-server-"${MEDIA_SERVER}".log & /opt/openvidu/openvidu-server-*.jar &>/opt/openvidu/openvidu-server-"${MEDIA_SERVER}".log &
fi fi
until $(curl --insecure --output /dev/null --silent --head --fail https://OPENVIDUAPP:MY_SECRET@localhost:4443/); do echo "Waiting for openvidu-server..."; sleep 2; done until $(curl --insecure --output /dev/null --silent --head --fail https://OPENVIDUAPP:MY_SECRET@localhost:4443/); do
echo "Waiting for openvidu-server..."
sleep 2
done
} }
function openviduE2ETests { function openviduE2ETests {
@ -87,7 +93,7 @@ function openviduE2ETests {
# Get e2e container id # Get e2e container id
local E2E_CONTAINER_ID local E2E_CONTAINER_ID
E2E_CONTAINER_ID="$(docker ps | grep 'openvidu/openvidu-test-e2e:*' | awk '{ print $1 }')" E2E_CONTAINER_ID="$(docker ps | grep 'openvidu/openvidu-test-e2e:*' | awk '{ print $1 }')"
# Get e2e container IP so services running can be accessed by browser and media server containers # Get e2e container IP so services running can be accessed by browser and media server containers
local E2E_CONTAINER_IP local E2E_CONTAINER_IP
@ -114,7 +120,7 @@ function openviduE2ETests {
-DREMOTE_URL_OPERA="http://${DOCKER_HOST_IP}:6668/wd/hub/" \ -DREMOTE_URL_OPERA="http://${DOCKER_HOST_IP}:6668/wd/hub/" \
-DREMOTE_URL_EDGE="http://${DOCKER_HOST_IP}:6669/wd/hub/" \ -DREMOTE_URL_EDGE="http://${DOCKER_HOST_IP}:6669/wd/hub/" \
-DEXTERNAL_CUSTOM_LAYOUT_PARAMS="sessionId,CUSTOM_LAYOUT_SESSION,secret,MY_SECRET" \ -DEXTERNAL_CUSTOM_LAYOUT_PARAMS="sessionId,CUSTOM_LAYOUT_SESSION,secret,MY_SECRET" \
test test
elif [[ "${MEDIA_SERVER}" == "mediasoup" ]]; then elif [[ "${MEDIA_SERVER}" == "mediasoup" ]]; then
@ -134,7 +140,7 @@ function openviduE2ETests {
-DEXTERNAL_CUSTOM_LAYOUT_PARAMS="sessionId,CUSTOM_LAYOUT_SESSION,secret,MY_SECRET" \ -DEXTERNAL_CUSTOM_LAYOUT_PARAMS="sessionId,CUSTOM_LAYOUT_SESSION,secret,MY_SECRET" \
-DOPENVIDU_PRO_LICENSE="${OPENVIDU_PRO_LICENSE}" \ -DOPENVIDU_PRO_LICENSE="${OPENVIDU_PRO_LICENSE}" \
-DOPENVIDU_PRO_LICENSE_API="${OPENVIDU_PRO_LICENSE_API}" \ -DOPENVIDU_PRO_LICENSE_API="${OPENVIDU_PRO_LICENSE_API}" \
test test
else else
echo "Not valid media server" echo "Not valid media server"
@ -148,9 +154,8 @@ function openviduE2ETests {
function stopMediaServer { function stopMediaServer {
# Remove Kurento Media Server # Remove Kurento Media Server
declare -a arr=("kurento/kurento-media-server" declare -a arr=("kurento/kurento-media-server"
"openvidu/mediasoup-controller:") "openvidu/mediasoup-controller:")
for image in "${arr[@]}" for image in "${arr[@]}"; do
do
docker ps -a | awk '{ print $1,$2 }' | grep "${image}" | awk '{ print $1 }' | xargs -I {} docker rm -f {} || true docker ps -a | awk '{ print $1,$2 }' | grep "${image}" | awk '{ print $1 }' | xargs -I {} docker rm -f {} || true
done done
docker ps -a docker ps -a
@ -158,41 +163,33 @@ function stopMediaServer {
# Environment variables # Environment variables
if [[ -n ${1:-} ]]; then if [[ -n ${1:-} ]]; then
while : while :; do
do
case "${1:-}" in case "${1:-}" in
--openvidu-server-unit-tests ) --openvidu-server-unit-tests)
OV_UNIT_TESTS=true OV_UNIT_TESTS=true
shift 1 ;;
;; --openvidu-server-integration-tests)
--openvidu-server-integration-tests ) OV_INTEGRATION_TESTS=true
OV_INTEGRATION_TESTS=true ;;
shift 1 --build-openvidu-test-e2e)
;; BUILD_OV_TEST_E2E=true
--build-openvidu-test-e2e ) ;;
BUILD_OV_TEST_E2E=true --environment-launch-kurento)
shift 1 LAUNCH_OV_KURENTO=true
;; ;;
--environment-launch-kurento ) --openvidu-e2e-tests-kurento)
LAUNCH_OV_KURENTO=true OV_E2E_KURENTO=true
shift 1 ;;
;; --environment-launch-mediasoup)
--openvidu-e2e-tests-kurento ) LAUNCH_OV_MEDIASOUP=true
OV_E2E_KURENTO=true ;;
shift 1 --openvidu-e2e-tests-mediasoup)
;; OV_E2E_MEDIASOUP=true
--environment-launch-mediasoup ) ;;
LAUNCH_OV_MEDIASOUP=true *)
shift 1 echo "Unrecognized method $1"
;; exit 1
--openvidu-e2e-tests-mediasoup ) ;;
OV_E2E_MEDIASOUP=true
shift 1
;;
*)
echo "Unrecognized method $1"
exit 1
;;
esac esac
done done
else else
@ -258,4 +255,4 @@ fi
# ------------- # -------------
if [[ "${OV_E2E_MEDIASOUP}" == true ]]; then if [[ "${OV_E2E_MEDIASOUP}" == true ]]; then
openviduE2ETests "mediasoup" openviduE2ETests "mediasoup"
fi fi