diff --git a/.github/workflows/openvidu-ce-test.yml b/.github/workflows/openvidu-ce-test.yml index 9ca421de..ea1d81c1 100644 --- a/.github/workflows/openvidu-ce-test.yml +++ b/.github/workflows/openvidu-ce-test.yml @@ -73,34 +73,34 @@ jobs: run: curl -s https://raw.githubusercontent.com/OpenVidu/openvidu/master/ci-scripts/commons.sh -o /opt/commons.sh && chmod u+x /opt/commons.sh - name: Clean environment run: /opt/commons.sh --clean-environment - - name: Setting up CI + - name: Prepare test environment run: /opt/commons.sh --prepare-test-environment openvidu/openvidu-test-e2e - name: Setting up Kurento Snapshots run: /opt/commons.sh --prepare-kurento-snapshot - - name: Build OpenVidu Browser - run: cd openvidu && /opt/commons.sh --build-openvidu-browser - - name: Build Openvidu Node Client - run: cd openvidu && /opt/commons.sh --build-openvidu-node-client - - name: Build Openvidu Java Client - run: cd openvidu && /opt/commons.sh --build-openvidu-java-client - - name: Build Openvidu Parent - run: cd openvidu && /opt/commons.sh --build-openvidu-parent - - name: Build Openvidu Testapp - run: cd openvidu && /opt/commons.sh --build-openvidu-testapp - - name: OpenVidu Server dashboard build - run: cd openvidu && /opt/commons.sh --build-openvidu-server-dashboard - - name: OpenVidu Server unit tests + - name: Build openvidu-browser + run: /opt/commons.sh --build-openvidu-browser + - name: Build openvidu-node-client + run: /opt/commons.sh --build-openvidu-node-client + - name: Build openvidu-java-client + run: /opt/commons.sh --build-openvidu-java-client + - name: Build openvidu-parent + run: /opt/commons.sh --build-openvidu-parent + - name: Build openvidu-testapp + run: /opt/commons.sh --build-openvidu-testapp + - name: Build openvidu-server dashboard + run: /opt/commons.sh --build-openvidu-server-dashboard + - name: openvidu-server unit tests run: ci-scripts/openvidu-e2e-tests.sh --openvidu-server-unit-tests - - name: OpenVidu Server integration tests + - name: openvidu-server integration tests run: ci-scripts/openvidu-e2e-tests.sh --openvidu-server-integration-tests - - name: OpenVidu Server E2E build tests - run: ci-scripts/openvidu-e2e-tests.sh --openvidu-test-e2e-build - - name: OpenVidu Server Build - run: cd openvidu && /opt/commons.sh --build-openvidu-server + - name: Build openvidu-test-e2e + run: ci-scripts/openvidu-e2e-tests.sh --build-openvidu-test-e2e + - name: Build openvidu-server + run: /opt/commons.sh --build-openvidu-server - name: Environment launch Kurento run: ci-scripts/openvidu-e2e-tests.sh --environment-launch-kurento - - name: Serve Testapp - run: cd openvidu && /opt/commons.sh --serve-openvidu-testapp + - name: Serve openvidu-testapp + run: /opt/commons.sh --serve-openvidu-testapp - name: OpenVidu E2E Tests Kurento run: ci-scripts/openvidu-e2e-tests.sh --openvidu-e2e-tests-kurento - name: Test reports diff --git a/ci-scripts/commons.sh b/ci-scripts/commons.sh index 1ac95e7d..ba6e56f5 100755 --- a/ci-scripts/commons.sh +++ b/ci-scripts/commons.sh @@ -435,7 +435,7 @@ if [[ "${PREPARE_KURENTO_SNAPSHOT}" == true || "${EXECUTE_ALL}" == true ]]; then fi # ------------- -# OpenVidu Browser build +# Build openvidu-browser # ------------- if [[ "${BUILD_OV_BROWSER}" == true || "${EXECUTE_ALL}" == true ]]; then pushd openvidu-browser || exit 1 @@ -448,7 +448,7 @@ if [[ "${BUILD_OV_BROWSER}" == true || "${EXECUTE_ALL}" == true ]]; then fi # ------------- -# OpenVidu Node client build +# Build openvidu-node-client # ------------- if [[ "${BUILD_OV_NODE_CLIENT}" == true || "${EXECUTE_ALL}" == true ]]; then pushd openvidu-node-client @@ -461,7 +461,7 @@ if [[ "${BUILD_OV_NODE_CLIENT}" == true || "${EXECUTE_ALL}" == true ]]; then fi # ------------- -# OpenVidu Java client build +# Build openvidu-java-client # ------------- if [[ "${BUILD_OV_JAVA_CLIENT}" == true || "${EXECUTE_ALL}" == true ]]; then pushd openvidu-java-client @@ -475,7 +475,7 @@ if [[ "${BUILD_OV_JAVA_CLIENT}" == true || "${EXECUTE_ALL}" == true ]]; then fi # ------------- -# OpenVidu Parent build +# Build openvidu-parent # ------------- if [[ "${BUILD_OV_PARENT}" == true || "${EXECUTE_ALL}" == true ]]; then mvn -B versions:set-property -Dproperty=version.openvidu.java.client -DnewVersion=TEST @@ -483,7 +483,7 @@ if [[ "${BUILD_OV_PARENT}" == true || "${EXECUTE_ALL}" == true ]]; then fi # ------------- -# OpenVidu Test App build +# Build openvidu-testapp # ------------- if [[ "${BUILD_OV_TESTAPP}" == true || "${EXECUTE_ALL}" == true ]]; then pushd openvidu-testapp @@ -494,7 +494,7 @@ if [[ "${BUILD_OV_TESTAPP}" == true || "${EXECUTE_ALL}" == true ]]; then fi # ------------- -# OpenVidu Server dashboard build +# Build openvidu-server dashboard # ------------- if [[ "${BUILD_OV_SERVER_DASHBOARD}" == true || "${EXECUTE_ALL}" == true ]]; then pushd openvidu-server/src/dashboard @@ -505,7 +505,7 @@ if [[ "${BUILD_OV_SERVER_DASHBOARD}" == true || "${EXECUTE_ALL}" == true ]]; the fi # ------------- -# OpenVidu Server build +# Build openvidu-server # ------------- if [[ "${BUILD_OV_SERVER}" == true || "${EXECUTE_ALL}" == true ]]; then pushd openvidu-server @@ -515,7 +515,7 @@ if [[ "${BUILD_OV_SERVER}" == true || "${EXECUTE_ALL}" == true ]]; then fi # ------------- -# OpenVidu Server dependency build +# Build openvidu-server dependency # ------------- if [[ "${BUILD_OV_SERVER_DEPENDENCY}" == true || "${EXECUTE_ALL}" == true ]]; then pushd openvidu-server @@ -524,7 +524,7 @@ if [[ "${BUILD_OV_SERVER_DEPENDENCY}" == true || "${EXECUTE_ALL}" == true ]]; th fi # ------------- -# OpenVidu Server PRO Inspector build +# Build Inspector # ------------- if [[ "${BUILD_OV_SERVER_PRO_INSPECTOR}" == true || "${EXECUTE_ALL}" == true ]]; then pushd dashboard @@ -535,7 +535,7 @@ if [[ "${BUILD_OV_SERVER_PRO_INSPECTOR}" == true || "${EXECUTE_ALL}" == true ]]; fi # ------------- -# OpenVidu Server PRO build +# Build openvidu-server-pro # ------------- if [[ "${BUILD_OV_SERVER_PRO}" == true || "${EXECUTE_ALL}" == true ]]; then pushd openvidu-server-pro @@ -545,7 +545,7 @@ if [[ "${BUILD_OV_SERVER_PRO}" == true || "${EXECUTE_ALL}" == true ]]; then fi # ------------- -# Serve OpenVidu TestApp +# Serve openvidu-testapp # ------------- if [[ "${SERVE_OV_TESTAPP}" == true || "${EXECUTE_ALL}" == true ]]; then # Generate certificate diff --git a/ci-scripts/openvidu-e2e-tests.sh b/ci-scripts/openvidu-e2e-tests.sh index 67a86ff6..3100914f 100755 --- a/ci-scripts/openvidu-e2e-tests.sh +++ b/ci-scripts/openvidu-e2e-tests.sh @@ -4,7 +4,7 @@ set -eu -o pipefail # Ci flags OV_INTEGRATION_TESTS=false OV_UNIT_TESTS=false -OV_E2E_TESTS_BUILD=false +BUILD_OV_TEST_E2E=false LAUNCH_OV_KURENTO=false OV_E2E_KURENTO=false LAUNCH_OV_MEDIASOUP=false @@ -170,8 +170,8 @@ if [[ -n ${1:-} ]]; then OV_INTEGRATION_TESTS=true shift 1 ;; - --openvidu-test-e2e-build ) - OV_E2E_TESTS_BUILD=true + --build-openvidu-test-e2e ) + BUILD_OV_TEST_E2E=true shift 1 ;; --environment-launch-kurento ) @@ -200,7 +200,7 @@ else fi # ------------- -# OpenVidu Unit tests +# openvidu-server unit tests # ------------- if [[ "${OV_UNIT_TESTS}" == true || "${EXECUTE_ALL}" == true ]]; then pushd openvidu-server @@ -209,7 +209,7 @@ if [[ "${OV_UNIT_TESTS}" == true || "${EXECUTE_ALL}" == true ]]; then fi # ------------- -# OpenVidu Integration tests +# openvidu-server integration tests # ------------- if [[ "${OV_INTEGRATION_TESTS}" == true || "${EXECUTE_ALL}" == true ]]; then pushd openvidu-server @@ -218,9 +218,9 @@ if [[ "${OV_INTEGRATION_TESTS}" == true || "${EXECUTE_ALL}" == true ]]; then fi # ------------- -# OpenVidu E2E Tests build +# Build openvidu-test-e2e # ------------- -if [[ "${OV_E2E_TESTS_BUILD}" == true || "${EXECUTE_ALL}" == true ]]; then +if [[ "${BUILD_OV_TEST_E2E}" == true || "${EXECUTE_ALL}" == true ]]; then pushd openvidu-test-browsers mvn -B versions:set -DnewVersion=TEST && mvn -B clean install popd