Adding sample checks

awslabs · Feb 7, 2025 · 856f3f4 · 856f3f4
1 parent 9e057c2
commit 856f3f4
Showing 1 changed file with 91 additions and 21 deletions.
diff --git a/.github/workflows/samples.yml b/.github/workflows/samples.yml
@@ -21,8 +21,8 @@ jobs:
             args: -f sample.mp4
           - name: kvs_gstreamer_file_uploader_sample
             args: sample.mp4 0 audio-video
-#          - name: kvs_gstreamer_multistream_sample
-#            args: ""
+          - name: kvs_gstreamer_multistream_sample
+            args: rtsp-urls.txt
           - name: kvs_gstreamer_sample
             args: sample.mp4
           - name: kvssink_gstreamer_sample
@@ -92,17 +92,14 @@ jobs:
 
       - name: Build samples (Windows)
         if: runner.os == 'Windows'
-        shell: cmd
         run: |
-          @echo on
-          set PATH=%PATH%;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Strawberry\c\bin;C:\Program Files\NASM;D:\a\amazon-kinesis-video-streams-producer-c\amazon-kinesis-video-streams-producer-c\open-source\lib;D:\a\amazon-kinesis-video-streams-producer-c\amazon-kinesis-video-streams-producer-c\open-source\bin
+          $env:Path += ';C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Strawberry\c\bin;C:\Program Files\NASM;D:\producer\open-source\local\lib;D:\producer\open-source\local\bin'
+          mkdir D:\producer
+          Move-Item -Path "D:\a\amazon-kinesis-video-streams-producer-sdk-cpp\amazon-kinesis-video-streams-producer-sdk-cpp\*" -Destination "D:\producer"
+          cd D:\producer
           git config --system core.longpaths true
-          "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          mkdir build
-          cd build
-          cmake -G "NMake Makefiles" -DBUILD_GSTREAMER_PLUGIN=ON -DPKG_CONFIG_EXECUTABLE="D:\\gstreamer\\1.0\\msvc_x86_64\\bin\\pkg-config.exe" ..
-          nmake
-          mkdir "%KVS_DEBUG_DUMP_DATA_FILE_DIR%"
+          dir
+          .github\build_windows.bat
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -112,8 +109,75 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
           role-duration-seconds: 10800
 
+      - name: Run multistream sample (Linux & Mac)
+        if: (runner.os == 'Linux' || runner.os == 'macOS') && matrix.sample.name == 'kvs_gstreamer_multistream_sample'
+        working-directory: ./build/debug_output
+        run: |
+          set -x
+          if [[ "$RUNNER_OS" == "Linux" ]]; then
+            sudo apt-get install -y docker.io
+          else
+            brew install --cask docker
+            open -a Docker
+          
+            # Wait for Docker to be ready
+            sleep 15
+
+            sudo ln -s ~/.docker/run/docker.sock /var/run/docker.sock
+          fi
+          
+          docker run -d --rm -e RTSP_PORT=8558 -p 8558:8558 -e GST_PIPELINE="videotestsrc pattern=ball ! videoscale ! video/x-raw,width=640,height=480,framerate=10/1 ! x264enc tune=zerolatency bitrate=512 ! rtph264pay name=pay0 pt=96" -e STREAM_NAME=stream1 bluenviron/mediamtx
+          docker run -d --rm -e RTSP_PORT=8559 -p 8559:8559 -e GST_PIPELINE="videotestsrc ! videoscale ! video/x-raw,width=640,height=480,framerate=10/1 ! x264enc tune=zerolatency bitrate=512 ! rtph264pay name=pay0 pt=96" -e STREAM_NAME=stream2 bluenviron/mediamtx
+          
+          echo "rtsp://0.0.0.0:8558/stream1" > rtsp-urls.txt
+          echo "rtsp://0.0.0.0:8559/stream2" >> rtsp-urls.txt
+          
+          sleep 5
+          
+          ./${{ matrix.sample.name }} demo-stream-producer-cpp-${{ matrix.runner.id }}-ci-${{ matrix.sample.name }} ${{ matrix.sample.args }}
+        shell: bash
+        env:
+          GST_PLUGIN_PATH: ${{ github.workspace }}/build
+          KVS_DEBUG_DUMP_DATA_FILE_DIR: ${{ github.workspace }}/build/debug_output
+
+      - name: Run multistream sample (Windows)
+        if: runner.os == 'Windows' && matrix.sample.name == 'kvs_gstreamer_multistream_sample'
+        shell: pwsh
+        working-directory: D:\producer\build
+        run: |
+          Invoke-WebRequest -Uri "https://github.com/bluenviron/mediamtx/releases/latest/download/mediamtx_windows_amd64.zip" -OutFile "mediamtx.zip"
+          Expand-Archive -Path mediamtx.zip -DestinationPath .
+
+          echo "paths:
+            all:
+              source: publisher
+            stream1:
+              runOnInit: `"gst-launch-1.0 videotestsrc pattern=ball ! videoscale ! video/x-raw,width=640,height=480,framerate=10/1 ! x264enc tune=zerolatency bitrate=512 ! rtph264pay name=pay0 pt=96 ! udpsink host=127.0.0.1 port=5004`"
+              runOnInitRestart: yes
+            stream2:
+              runOnInit: `"gst-launch-1.0 videotestsrc ! videoscale ! video/x-raw,width=640,height=480,framerate=10/1 ! x264enc tune=zerolatency bitrate=512 ! rtph264pay name=pay0 pt=96 ! udpsink host=127.0.0.1 port=5006`"
+              runOnInitRestart: yes" | Out-File -FilePath mediamtx.yml -Encoding utf8
+
+          Start-Process -NoNewWindow -FilePath ".\mediamtx.exe" -ArgumentList "-config mediamtx.yml"
+
+          echo "rtsp://127.0.0.1:8554/stream1" | Out-File -FilePath rtsp-urls.txt -Encoding UTF8
+          echo "rtsp://127.0.0.1:8554/stream2" | Out-File -FilePath rtsp-urls.txt -Append -Encoding UTF8
+
+          # Run the sample application
+          Start-Sleep -Seconds 10  # Wait for server to be ready
+          
+          $env:Path += ';C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Strawberry\c\bin;C:\Program Files\NASM;D:\producer\open-source\local\lib;D:\producer\open-source\local\bin;D:\gstreamer\1.0\msvc_x86_64\bin'
+          
+          mkdir D:\producer\debug_output
+          
+          $exePath = Join-Path $PWD ${{ matrix.sample.name }}.exe
+          & $exePath demo-stream-producer-cpp-${{ matrix.runner.id }}-ci-${{ matrix.sample.name }} ${{ matrix.sample.args }}
+        env:
+          GST_PLUGIN_PATH: D:\producer\build
+          KVS_DEBUG_DUMP_DATA_FILE_DIR: D:\producer\debug_output
+
       - name: Run ${{ matrix.sample.name }} (Linux & Mac)
-        if: runner.os == 'Linux' || runner.os == 'macOS'
+        if: (runner.os == 'Linux' || runner.os == 'macOS') && matrix.sample.name != 'kvs_gstreamer_multistream_sample'
         env:
           GST_PLUGIN_PATH: ${{ github.workspace }}/build
           KVS_DEBUG_DUMP_DATA_FILE_DIR: ${{ github.workspace }}/build/debug_output
@@ -123,17 +187,23 @@ jobs:
           ./${{ matrix.sample.name }} demo-stream-producer-cpp-${{ matrix.runner.id }}-ci-${{ matrix.sample.name }} ${{ matrix.sample.args }}
 
       - name: Run ${{ matrix.sample.name }} (Windows)
-        if: runner.os == 'Windows'
+        if: runner.os == 'Windows' && matrix.sample.name != 'kvs_gstreamer_multistream_sample'
         env:
-          GST_PLUGIN_PATH: ${{ github.workspace }}/build
-          KVS_DEBUG_DUMP_DATA_FILE_DIR: ${{ github.workspace }}/build/debug_output
-        working-directory: ./build
+          GST_PLUGIN_PATH: D:\producer\build
+          KVS_DEBUG_DUMP_DATA_FILE_DIR: D:\producer\debug_output
+        working-directory: D:\producer\build
         run: |
+          # Equivalent to set -x
+          Set-PSDebug -Trace 1
+          
           $env:Path += ';C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Strawberry\c\bin;C:\Program Files\NASM;D:\producer\open-source\local\lib;D:\producer\open-source\local\bin;D:\gstreamer\1.0\msvc_x86_64\bin'
           
+          mkdir D:\producer\debug_output
+          
           Invoke-WebRequest -Uri https://awsj-iot-handson.s3-ap-northeast-1.amazonaws.com/kvs-workshop/sample.mp4 -OutFile sample.mp4
-          $exePath = Join-Path $PWD ${{ matrix.sample.name }}
-          & $exePath.exe demo-stream-producer-cpp-${{ matrix.runner.id }}-ci-${{ matrix.sample.name }} ${{ matrix.sample.args }}
+          dir
+          $exePath = Join-Path $PWD ${{ matrix.sample.name }}.exe
+          & $exePath demo-stream-producer-cpp-${{ matrix.runner.id }}-ci-${{ matrix.sample.name }} ${{ matrix.sample.args }}
 
       - name: Verify MKV dump (Mac & Linux)
         if: runner.os == 'Linux' || runner.os == 'macOS'
@@ -154,13 +224,13 @@ jobs:
           done
         shell: bash
 
-      - name: Verify MKV dump
+      - name: Verify MKV dump (Windows)
         if: runner.os == 'Windows'
         working-directory: D:\producer\build
         run: |
           $env:Path += ";C:\Program Files\MKVToolNix"
-          dir debug_output
-          $mkvFiles = Get-ChildItem -Path "D:\producer\build\debug_output" -Filter *.mkv
+          dir D:\producer\debug_output
+          $mkvFiles = Get-ChildItem -Path "D:\producer\debug_output" -Filter *.mkv
           if ($mkvFiles.Count -eq 0) {
             Write-Error "No MKV files found in D:\producer\build\debug_output"
             exit 1