From c1d8044a2eb4bcfbe335464caeb231d8a5b7d592 Mon Sep 17 00:00:00 2001 From: Carlos Santos <4a.santos@gmail.com> Date: Tue, 15 Jul 2025 12:26:52 +0200 Subject: [PATCH] ci: Excludes openvidu-meet from Docker Compose Excludes the openvidu-meet container from the Docker Compose setup in integration tests. This prevents conflicts and ensures a more focused testing environment. Additionally, this commit changes the Azure container name to single quotes. --- .../workflows/backend-integration-test.yaml | 79 +++++++++++++------ 1 file changed, 57 insertions(+), 22 deletions(-) diff --git a/.github/workflows/backend-integration-test.yaml b/.github/workflows/backend-integration-test.yaml index 8ce7120..6f734a5 100644 --- a/.github/workflows/backend-integration-test.yaml +++ b/.github/workflows/backend-integration-test.yaml @@ -66,6 +66,12 @@ jobs: } ' egress.yaml fi + + echo "Commenting out openvidu-meet container in docker-compose.yaml" + if [ -f docker-compose.yaml ]; then + yq e 'del(.services.openvidu-meet)' -i docker-compose.yaml + fi + BASH chmod +x pre_startup_commands.sh && ./pre_startup_commands.sh - name: Setup OpenVidu Meet @@ -74,7 +80,7 @@ jobs: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-rooms" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-rooms' - name: Run tests run: | cd backend @@ -83,7 +89,7 @@ jobs: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-rooms" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-rooms' JEST_JUNIT_OUTPUT_DIR: './reports/' - name: Publish Test Report uses: mikepenz/action-junit-report@v4 @@ -130,6 +136,11 @@ jobs: "container_name": "openvidu-appdata-recordings" } ' egress.yaml + + echo "Commenting out openvidu-meet container in docker-compose.yaml" + if [ -f docker-compose.yaml ]; then + yq e 'del(.services.openvidu-meet)' -i docker-compose.yaml + fi fi BASH chmod +x pre_startup_commands.sh && ./pre_startup_commands.sh @@ -139,7 +150,7 @@ jobs: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-recordings" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-recordings' - name: Run tests run: | cd backend @@ -148,7 +159,7 @@ jobs: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-recordings" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-recordings' JEST_JUNIT_OUTPUT_DIR: './reports/' - name: Publish Test Report uses: mikepenz/action-junit-report@v4 @@ -193,15 +204,19 @@ jobs: } ' egress.yaml fi + echo "Commenting out openvidu-meet container in docker-compose.yaml" + if [ -f docker-compose.yaml ]; then + yq e 'del(.services.openvidu-meet)' -i docker-compose.yaml + fi BASH - chmod +x pre_startup_commands.sh && ./pre_startup_commands.sh + chmod +x pre_startup_commands.sh && ./pre_startup_commands.sh - name: Setup OpenVidu Meet uses: OpenVidu/actions/start-openvidu-meet@main env: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-webhooks" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-webhooks' - name: Run tests run: | cd backend @@ -210,7 +225,7 @@ jobs: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-webhooks" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-webhooks' JEST_JUNIT_OUTPUT_DIR: './reports/' - name: Publish Test Report uses: mikepenz/action-junit-report@v4 @@ -255,15 +270,19 @@ jobs: } ' egress.yaml fi + echo "Commenting out openvidu-meet container in docker-compose.yaml" + if [ -f docker-compose.yaml ]; then + yq e 'del(.services.openvidu-meet)' -i docker-compose.yaml + fi BASH - chmod +x pre_startup_commands.sh && ./pre_startup_commands.sh + chmod +x pre_startup_commands.sh && ./pre_startup_commands.sh - name: Setup OpenVidu Meet uses: OpenVidu/actions/start-openvidu-meet@main env: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-security" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-security' - name: Run tests run: | cd backend @@ -272,7 +291,7 @@ jobs: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-security" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-security' JEST_JUNIT_OUTPUT_DIR: './reports/' - name: Publish Test Report uses: mikepenz/action-junit-report@v4 @@ -317,15 +336,19 @@ jobs: } ' egress.yaml fi + echo "Commenting out openvidu-meet container in docker-compose.yaml" + if [ -f docker-compose.yaml ]; then + yq e 'del(.services.openvidu-meet)' -i docker-compose.yaml + fi BASH - chmod +x pre_startup_commands.sh && ./pre_startup_commands.sh + chmod +x pre_startup_commands.sh && ./pre_startup_commands.sh - name: Setup OpenVidu Meet uses: OpenVidu/actions/start-openvidu-meet@main env: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-global-preferences" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-global-preferences' - name: Run tests run: | cd backend @@ -334,7 +357,7 @@ jobs: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-global-preferences" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-global-preferences' JEST_JUNIT_OUTPUT_DIR: './reports/' - name: Publish Test Report uses: mikepenz/action-junit-report@v4 @@ -379,15 +402,19 @@ jobs: } ' egress.yaml fi + echo "Commenting out openvidu-meet container in docker-compose.yaml" + if [ -f docker-compose.yaml ]; then + yq e 'del(.services.openvidu-meet)' -i docker-compose.yaml + fi BASH - chmod +x pre_startup_commands.sh && ./pre_startup_commands.sh + chmod +x pre_startup_commands.sh && ./pre_startup_commands.sh - name: Setup OpenVidu Meet uses: OpenVidu/actions/start-openvidu-meet@main env: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-participants" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-participants' - name: Run tests run: | cd backend @@ -396,7 +423,7 @@ jobs: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-participants" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-participants' JEST_JUNIT_OUTPUT_DIR: './reports/' - name: Publish Test Report uses: mikepenz/action-junit-report@v4 @@ -441,15 +468,19 @@ jobs: } ' egress.yaml fi + echo "Commenting out openvidu-meet container in docker-compose.yaml" + if [ -f docker-compose.yaml ]; then + yq e 'del(.services.openvidu-meet)' -i docker-compose.yaml + fi BASH - chmod +x pre_startup_commands.sh && ./pre_startup_commands.sh + chmod +x pre_startup_commands.sh && ./pre_startup_commands.sh - name: Setup OpenVidu Meet uses: OpenVidu/actions/start-openvidu-meet@main env: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-meetings" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-meetings' - name: Run tests run: | cd backend @@ -458,7 +489,7 @@ jobs: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-meetings" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-meetings' JEST_JUNIT_OUTPUT_DIR: './reports/' - name: Publish Test Report uses: mikepenz/action-junit-report@v4 @@ -503,15 +534,19 @@ jobs: } ' egress.yaml fi + echo "Commenting out openvidu-meet container in docker-compose.yaml" + if [ -f docker-compose.yaml ]; then + yq e 'del(.services.openvidu-meet)' -i docker-compose.yaml + fi BASH - chmod +x pre_startup_commands.sh && ./pre_startup_commands.sh + chmod +x pre_startup_commands.sh && ./pre_startup_commands.sh - name: Setup OpenVidu Meet uses: OpenVidu/actions/start-openvidu-meet@main env: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-users" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-users' - name: Run tests run: | cd backend @@ -520,7 +555,7 @@ jobs: MEET_PREFERENCES_STORAGE_MODE: ${{ matrix.storage-provider }} MEET_AZURE_ACCOUNT_NAME: ${{ vars.MEET_AZURE_ACCOUNT_NAME }} MEET_AZURE_ACCOUNT_KEY: ${{ secrets.MEET_AZURE_ACCOUNT_KEY }} - MEET_AZURE_CONTAINER_NAME: "openvidu-appdata-users" + MEET_AZURE_CONTAINER_NAME: 'openvidu-appdata-users' JEST_JUNIT_OUTPUT_DIR: './reports/' - name: Publish Test Report uses: mikepenz/action-junit-report@v4