From 9b6a3b3195d6cbfdea99a98ab911222e2dc532e5 Mon Sep 17 00:00:00 2001
From: charliez <charlie.zha@broadcom.com>
Date: Mon, 31 Aug 2026 16:29:50 -0700
Subject: [PATCH] Drop nightly-stress-test.yml's own schedule and branch input

run-nightly-stress.yml (master) now dispatches every branch's nightly
stress test explicitly via its matrix, so 3006.x's own schedule: was
redundant -- it never actually fired anyway, since GitHub only honors
schedule: from the repository's default branch. Drop it and let
run-nightly-stress.yml be the sole cron entry point and sole branch
list, matching the existing nightly.yml/run-nightly.yml split.

Also drop the branch workflow_dispatch input: every real caller
already passes --ref matching it, so github.ref_name reads the same
value without a second parameter that could drift out of sync.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 .github/workflows/nightly-stress-test.yml | 34 +++++++++++++----------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/nightly-stress-test.yml b/.github/workflows/nightly-stress-test.yml
index a389c6c3340..04f4a690fe7 100644
--- a/.github/workflows/nightly-stress-test.yml
+++ b/.github/workflows/nightly-stress-test.yml
@@ -1,13 +1,15 @@
 name: Nightly Stress Test
+run-name: "Nightly Stress Test (branch: ${{ github.ref_name }})"
 
+# No `schedule:` here -- run-nightly-stress.yml is the sole cron owner
+# and the sole source of the branch list (matching nightly.yml /
+# run-nightly.yml's split). `--ref X` from run-nightly-stress.yml's
+# matrix is what selects the branch this runs against; github.ref_name
+# below picks that same branch back up for cache keys, artifact names,
+# and the stress-snapshots run path -- no `branch` input needed.
 on:
-  schedule:
-    - cron: '0 2 * * *' # 2 AM UTC
   workflow_dispatch:
     inputs:
-      branch:
-        description: 'Branch to check out and test'
-        required: true
       duration:
         description: Stress test duration (GitHub-hosted runner caps at 6h)
         required: true
@@ -47,8 +49,6 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.branch }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -57,9 +57,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ inputs.branch }}-${{ github.sha }}
+          key: ${{ runner.os }}-buildx-${{ github.ref_name }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-buildx-${{ inputs.branch }}-
+            ${{ runner.os }}-buildx-${{ github.ref_name }}-
 
       - name: Build and Start Environment
         run: |
@@ -110,8 +110,10 @@ jobs:
 
           # Empty WORKER_THREADS (the default) means "leave this branch's
           # own master.conf value alone" -- only touch it when the caller
-          # explicitly asked for a specific value, so a default-parameter
-          # run isn't nudged into an unrequested config change + restart.
+          # explicitly asked for a specific value, so master/3006.x runs
+          # (which never had this knob before) aren't nudged into an
+          # unrequested config change + restart just because this input
+          # merged in from 3008.x's own copy of this workflow.
           current_workers=$(awk '/^worker_threads:/ {print $2}' master.conf)
           if [ -n "$WORKER_THREADS" ] && [ -n "$current_workers" ] && [ "$current_workers" != "$WORKER_THREADS" ]; then
             echo "Setting worker_threads: $current_workers -> $WORKER_THREADS"
@@ -234,7 +236,11 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: stress-test-results-${{ inputs.branch }}
+          # Branch-qualified for readability when browsing runs/artifacts
+          # across dispatches, not for collision-avoidance -- each
+          # dispatch (nightly or manual) is its own workflow run with its
+          # own github.run_id, so names can't collide across branches.
+          name: stress-test-results-${{ github.ref_name }}
           path: |
             artifacts/
             prometheus-data.tar.gz
@@ -255,7 +261,7 @@ jobs:
           set -e
           REPO_URL="https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}.git"
           BRANCH=stress-snapshots
-          RUN_DIR="runs/${{ github.run_id }}/${{ inputs.branch }}"
+          RUN_DIR="runs/${{ github.run_id }}/${{ github.ref_name }}"
 
           if git ls-remote --exit-code --heads "$REPO_URL" "$BRANCH" >/dev/null 2>&1; then
             git clone --depth=1 --branch="$BRANCH" "$REPO_URL" snaps
@@ -310,6 +316,6 @@ jobs:
           cd tests/monitoring
           PANELS_DIR="${GITHUB_WORKSPACE}/artifacts/panels" \
             python3 render_panels.py --summary --from-existing \
-              --artifact-name stress-test-results-${{ inputs.branch }} \
+              --artifact-name stress-test-results-${{ github.ref_name }} \
               --artifact-url "${{ steps.upload-artifacts.outputs.artifact-url }}" \
               --image-url-prefix "${{ steps.publish-snapshots.outputs.url-prefix }}"