Merge branch 'master' into migrate/perf_interop

Author: sumanjeet0012

.github/actions/run-bash-hole-punch-test/action.yml

@@ -26,6 +26,10 @@ inputs:
     description: "Ignore routers (pipe-separated substrings)"
     required: false
     default: ""
+  transport-ignore:
+    description: "Ignore transports (pipe-separated patterns). Default excludes ws and webrtc-direct which are incompatible with DCUtR hole-punching."
+    required: false
+    default: "ws|webrtc-direct"
   cache-dir:
     description: "Local directory to use for build cache"
     required: false
@@ -42,6 +46,10 @@ inputs:
     description: "Force Docker image rebuilds (bypass cache)"
     required: false
     default: "false"
+  export-docker-images:
+    description: "Export Docker images when creating snapshot"
+    required: false
+    default: "false"
   debug:
     description: "Enable debug mode (sets DEBUG=true in test containers)"
     required: false
@@ -50,13 +58,9 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Install docker-compose
+    - name: Verify docker compose
       shell: bash
-      run: |
-        mkdir -p $HOME/.docker/cli-plugins
-        wget -q -O- https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-x86_64 > $HOME/.docker/cli-plugins/docker-compose
-        chmod +x $HOME/.docker/cli-plugins/docker-compose
-        docker compose version
+      run: docker compose version
 
     - name: Run hole punch interop tests
       shell: bash
@@ -82,6 +86,11 @@ runs:
           FORCE_IMAGE_FLAG="--force-image-rebuild"
         fi
 
+        EXPORT_DOCKER_FLAG=""
+        if [ "${{ inputs.export-docker-images }}" = "true" ]; then
+          EXPORT_DOCKER_FLAG="--export-docker-images"
+        fi
+
         DEBUG_FLAG=""
         if [ "${{ inputs.debug }}" = "true" ]; then
           DEBUG_FLAG="--debug"
@@ -94,8 +103,10 @@ runs:
           --relay-ignore '${{ inputs.relay-ignore }}' \
           --router-select '${{ inputs.router-select }}' \
           --router-ignore '${{ inputs.router-ignore }}' \
+          --transport-ignore '${{ inputs.transport-ignore }}' \
           --cache-dir '${{ inputs.cache-dir }}' \
           $SNAPSHOT_FLAG \
+          $EXPORT_DOCKER_FLAG \
           $FORCE_MATRIX_FLAG \
           $FORCE_IMAGE_FLAG \
           $DEBUG_FLAG \

.github/actions/run-bash-perf-test/action.yml

@@ -54,6 +54,10 @@ inputs:
     description: "Force Docker image rebuilds (bypass cache)"
     required: false
     default: "false"
+  export-docker-images:
+    description: "Export Docker images when creating snapshot"
+    required: false
+    default: "false"
   debug:
     description: "Enable debug mode (sets DEBUG=true in test containers)"
     required: false
@@ -62,13 +66,9 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Install docker-compose
+    - name: Verify docker compose
       shell: bash
-      run: |
-        mkdir -p $HOME/.docker/cli-plugins
-        wget -q -O- https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-x86_64 > $HOME/.docker/cli-plugins/docker-compose
-        chmod +x $HOME/.docker/cli-plugins/docker-compose
-        docker compose version
+      run: docker compose version
 
     - name: Run perf benchmarks
       shell: bash
@@ -94,6 +94,11 @@ runs:
           FORCE_IMAGE_FLAG="--force-image-rebuild"
         fi
 
+        EXPORT_DOCKER_FLAG=""
+        if [ "${{ inputs.export-docker-images }}" = "true" ]; then
+          EXPORT_DOCKER_FLAG="--export-docker-images"
+        fi
+
         DEBUG_FLAG=""
         if [ "${{ inputs.debug }}" = "true" ]; then
           DEBUG_FLAG="--debug"
@@ -125,7 +130,7 @@ runs:
         fi
 
         ./run.sh \
-          --test-select '${{ inputs.test-select }}' \
+          --impl-select '${{ inputs.test-select }}' \
           --test-ignore '${{ inputs.test-ignore }}' \
           --baseline-select '${{ inputs.baseline-select }}' \
           --baseline-ignore '${{ inputs.baseline-ignore }}' \
@@ -136,6 +141,7 @@ runs:
           $DURATION_FLAG \
           $LATENCY_ITERATIONS_FLAG \
           $SNAPSHOT_FLAG \
+          $EXPORT_DOCKER_FLAG \
           $FORCE_MATRIX_FLAG \
           $FORCE_IMAGE_FLAG \
           $DEBUG_FLAG \
@@ -174,16 +180,6 @@ runs:
           ${{ steps.find-test-pass.outputs.test-pass-dir }}/LATEST_TEST_RESULTS.md
         if-no-files-found: warn
 
-    - name: Upload box plot images
-      if: always()
-      uses: actions/upload-artifact@v4
-      with:
-        name: perf-test-box-plot-${{ steps.find-test-pass.outputs.test-pass-name }}
-        path: |
-          ${{ steps.find-test-pass.outputs.test-pass-dir }}/boxplot-*.png
-        if-no-files-found: ignore
-        compression-level: 0
-
     - name: Upload snapshot archive
       if: always() && inputs.snapshot == 'true'
       uses: actions/upload-artifact@v4

.github/actions/run-bash-transport-test/action.yml

@@ -26,6 +26,10 @@ inputs:
     description: "Force Docker image rebuilds (bypass cache)"
     required: false
     default: "false"
+  export-docker-images:
+    description: "Export Docker images when creating snapshot"
+    required: false
+    default: "false"
   debug:
     description: "Enable debug mode (sets DEBUG=true in test containers)"
     required: false
@@ -34,13 +38,9 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Install docker-compose
+    - name: Verify docker compose
       shell: bash
-      run: |
-        mkdir -p $HOME/.docker/cli-plugins
-        wget -q -O- https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-x86_64 > $HOME/.docker/cli-plugins/docker-compose
-        chmod +x $HOME/.docker/cli-plugins/docker-compose
-        docker compose version
+      run: docker compose version
 
     - name: Run transport interop tests
       shell: bash
@@ -66,6 +66,11 @@ runs:
           FORCE_IMAGE_FLAG="--force-image-rebuild"
         fi
 
+        EXPORT_DOCKER_FLAG=""
+        if [ "${{ inputs.export-docker-images }}" = "true" ]; then
+          EXPORT_DOCKER_FLAG="--export-docker-images"
+        fi
+
         DEBUG_FLAG=""
         if [ "${{ inputs.debug }}" = "true" ]; then
           DEBUG_FLAG="--debug"
@@ -76,6 +81,7 @@ runs:
           --test-ignore '${{ inputs.test-ignore }}' \
           --cache-dir '${{ inputs.cache-dir }}' \
           $SNAPSHOT_FLAG \
+          $EXPORT_DOCKER_FLAG \
           $FORCE_MATRIX_FLAG \
           $FORCE_IMAGE_FLAG \
           $DEBUG_FLAG \

.github/actions/run-transport-interop-test/action.yml

@@ -10,7 +10,7 @@ inputs:
     required: false
     default: ""
   test-root:
-    description: "Path to the transport-interop folder"
+    description: "Path to the transport folder"
     required: true
   update-readme:
     description: "Whether to update the README.md file with the new dashboard"
@@ -69,11 +69,11 @@ runs:
         echo "PUSH_CACHE=true" >> $GITHUB_ENV
 
     # This depends on where this file is within this repository. This walks up
-    # from here to the transport-interop folder
+    # from here to the transport folder
     - name: Find working directory
       shell: bash
       run: |
-        WORK_DIR=$(realpath "$GITHUB_ACTION_PATH/../../../transport-interop")
+        WORK_DIR=$(realpath "$GITHUB_ACTION_PATH/../../../transport")
         echo "WORK_DIR=$WORK_DIR" >> $GITHUB_OUTPUT
       id: find-workdir
 

.github/workflows/daily-full-interop.yml

@@ -62,6 +62,11 @@ on:
         required: false
         default: '~failing'
         type: string
+      hole-punch-transport-ignore:
+        description: '[Hole-punch] Ignore transports (pipe-separated patterns)'
+        required: false
+        default: 'ws|webrtc-direct'
+        type: string
       hole-punch-force-matrix-rebuild:
         description: '[Hole-punch] Force test matrix regeneration'
         required: false
@@ -124,6 +129,11 @@ on:
         required: false
         default: false
         type: boolean
+      export-docker-images:
+        description: 'Export Docker images in snapshot (enabled by default on schedule, disabled on manual)'
+        required: false
+        default: false
+        type: boolean
 
 jobs:
   resolve-transport-parameters:
@@ -195,6 +205,7 @@ jobs:
       relay-ignore: ${{ steps.resolve.outputs.relay-ignore }}
       router-select: ${{ steps.resolve.outputs.router-select }}
       router-ignore: ${{ steps.resolve.outputs.router-ignore }}
+      transport-ignore: ${{ steps.resolve.outputs.transport-ignore }}
       force-matrix-rebuild: ${{ steps.resolve.outputs.force-matrix-rebuild }}
       force-image-rebuild: ${{ steps.resolve.outputs.force-image-rebuild }}
       debug: ${{ steps.resolve.outputs.debug }}
@@ -217,6 +228,7 @@ jobs:
             echo "relay-ignore=${{ github.event.inputs.hole-punch-relay-ignore }}" >> $GITHUB_OUTPUT
             echo "router-select=${{ github.event.inputs.hole-punch-router-select }}" >> $GITHUB_OUTPUT
             echo "router-ignore=${{ github.event.inputs.hole-punch-router-ignore }}" >> $GITHUB_OUTPUT
+            echo "transport-ignore=${{ github.event.inputs.hole-punch-transport-ignore }}" >> $GITHUB_OUTPUT
             echo "force-matrix-rebuild=${{ github.event.inputs.hole-punch-force-matrix-rebuild }}" >> $GITHUB_OUTPUT
             echo "force-image-rebuild=${{ github.event.inputs.hole-punch-force-image-rebuild }}" >> $GITHUB_OUTPUT
             echo "debug=${{ github.event.inputs.hole-punch-debug }}" >> $GITHUB_OUTPUT
@@ -233,6 +245,7 @@ jobs:
             echo "relay-ignore=" >> $GITHUB_OUTPUT
             echo "router-select=" >> $GITHUB_OUTPUT
             echo "router-ignore=" >> $GITHUB_OUTPUT
+            echo "transport-ignore=ws|webrtc-direct" >> $GITHUB_OUTPUT
             echo "force-image-rebuild=false" >> $GITHUB_OUTPUT
             echo "debug=false" >> $GITHUB_OUTPUT
 
@@ -331,6 +344,7 @@ jobs:
           test-ignore: '${{ needs.resolve-transport-parameters.outputs.test-ignore }}'
           cache-dir: /srv/cache
           snapshot: true
+          export-docker-images: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.export-docker-images == 'true' }}
           force-matrix-rebuild: ${{ needs.resolve-transport-parameters.outputs.force-matrix-rebuild }}
           force-image-rebuild: ${{ needs.resolve-transport-parameters.outputs.force-image-rebuild }}
           debug: ${{ needs.resolve-transport-parameters.outputs.debug }}
@@ -353,8 +367,10 @@ jobs:
           relay-ignore: '${{ needs.resolve-hole-punch-parameters.outputs.relay-ignore }}'
           router-select: '${{ needs.resolve-hole-punch-parameters.outputs.router-select }}'
           router-ignore: '${{ needs.resolve-hole-punch-parameters.outputs.router-ignore }}'
+          transport-ignore: '${{ needs.resolve-hole-punch-parameters.outputs.transport-ignore }}'
           cache-dir: /srv/cache
           snapshot: true
+          export-docker-images: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.export-docker-images == 'true' }}
           force-matrix-rebuild: ${{ needs.resolve-hole-punch-parameters.outputs.force-matrix-rebuild }}
           force-image-rebuild: ${{ needs.resolve-hole-punch-parameters.outputs.force-image-rebuild }}
           debug: ${{ needs.resolve-hole-punch-parameters.outputs.debug }}
@@ -378,6 +394,7 @@ jobs:
           iterations: '${{ needs.resolve-perf-parameters.outputs.iterations }}'
           cache-dir: /srv/cache
           snapshot: true
+          export-docker-images: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.export-docker-images == 'true' }}
           force-matrix-rebuild: ${{ needs.resolve-perf-parameters.outputs.force-matrix-rebuild }}
           force-image-rebuild: ${{ needs.resolve-perf-parameters.outputs.force-image-rebuild }}
           debug: ${{ needs.resolve-perf-parameters.outputs.debug }}
@@ -396,6 +413,7 @@ jobs:
 
       - name: Download transport test results
         if: needs.run-transport-full.result != 'skipped'
+        continue-on-error: true
         uses: actions/download-artifact@v4
         with:
           pattern: transport-test-results-*
@@ -404,6 +422,7 @@ jobs:
 
       - name: Download hole-punch test results
         if: needs.run-hole-punch-full.result != 'skipped'
+        continue-on-error: true
         uses: actions/download-artifact@v4
         with:
           pattern: hole-punch-test-results-*
@@ -412,6 +431,7 @@ jobs:
 
       - name: Download perf test results
         if: needs.run-perf-full.result != 'skipped'
+        continue-on-error: true
         uses: actions/download-artifact@v4
         with:
           pattern: perf-test-results-*
@@ -449,7 +469,6 @@ jobs:
             yq eval '.testResults[0]' "$PERF_YAML" 2>/dev/null || echo "No test results found"
           fi
 
-
       - name: Find result directories and prepare merge
         id: find-results
         shell: bash
@@ -535,31 +554,34 @@ jobs:
           echo "=== Generated YAML content preview ==="
           head -100 /tmp/merged-results/daily-full-interop.yml
 
-      - name: Install AWS CLI
+      - name: Verify AWS CLI
         if: github.event_name != 'workflow_dispatch' || inputs.upload-results
         shell: bash
+        run: aws --version
+
+      - name: Configure AWS credentials for Filebase
+        if: github.event_name != 'workflow_dispatch' || inputs.upload-results
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.FILEBASE_ACCESS_KEY }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.FILEBASE_SECRET_KEY }}
+          AWS_DEFAULT_REGION: us-east-1   # Filebase ignores region, but required
         run: |
-          if ! command -v aws &> /dev/null; then
-            echo "Installing AWS CLI..."
-            curl -fsSL "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o /tmp/awscliv2.zip
-            unzip -q /tmp/awscliv2.zip -d /tmp/aws-install
-            /tmp/aws-install/aws/install --bin-dir /usr/local/bin --install-dir /usr/local/aws-cli --update
-            rm -rf /tmp/awscliv2.zip /tmp/aws-install
-          fi
-          aws --version
+          echo "AWS credentials exported as env vars"
+          aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
+          aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
+          aws configure set default.region $AWS_DEFAULT_REGION
+          aws configure list
 
       - name: Upload results to Filebase
         if: github.event_name != 'workflow_dispatch' || inputs.upload-results
         shell: bash
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.FILEBASE_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.FILEBASE_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: us-east-1
+          AWS_EC2_METADATA_DISABLED: true
         run: |
           set -euo pipefail
 
           RESULTS_FILE="/tmp/merged-results/daily-full-interop.yml"
-          BUCKET="test-plans-results"
+          BUCKET="results"
           ENDPOINT="https://s3.filebase.com"
           DATE_STAMP=$(date -u +"%Y-%m-%d")
 
@@ -575,14 +597,16 @@ jobs:
 
           # Upload as date-stamped archive
           echo "-> Uploading history/${DATE_STAMP}.yaml..."
-          aws s3 cp "$RESULTS_FILE" "s3://${BUCKET}/history/${DATE_STAMP}.yaml" \
-            --endpoint-url "$ENDPOINT" \
+          aws --endpoint "$ENDPOINT" \
+            s3 cp "$RESULTS_FILE" \
+            "s3://${BUCKET}/history/${DATE_STAMP}.yaml" \
             --content-type "application/x-yaml"
 
           # Upload as latest results (overwrite)
           echo "-> Uploading results.yaml (latest)..."
-          aws s3 cp "$RESULTS_FILE" "s3://${BUCKET}/results.yaml" \
-            --endpoint-url "$ENDPOINT" \
+          aws --endpoint "$ENDPOINT" \
+            s3 cp "$RESULTS_FILE" \
+            "s3://${BUCKET}/results.yaml" \
             --content-type "application/x-yaml"
 
           echo "Upload complete."