From e6b2b2faf73f8fd9d1f8f8f81180f68b7b927711 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 7 Jan 2026 09:15:21 -0500 Subject: [PATCH 1/3] Revert pin-system-tests workflow and add print job --- .../self.pin-system-tests.create-pr.sts.yaml | 6 +++--- .github/workflows/pin-system-tests.yaml | 18 ++++++++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/chainguard/self.pin-system-tests.create-pr.sts.yaml b/.github/chainguard/self.pin-system-tests.create-pr.sts.yaml index c2b192475a7..5041744f0da 100644 --- a/.github/chainguard/self.pin-system-tests.create-pr.sts.yaml +++ b/.github/chainguard/self.pin-system-tests.create-pr.sts.yaml @@ -1,11 +1,11 @@ issuer: https://token.actions.githubusercontent.com -subject_pattern: repo:DataDog/dd-trace-java:ref:refs/heads/(master|test/v.+) +subject_pattern: repo:DataDog/dd-trace-java:ref:refs/heads/(master|release/v.+) claim_pattern: event_name: (create|workflow_dispatch) - ref: refs/heads/(master|test/v.+) - job_workflow_ref: DataDog/dd-trace-java/\.github/workflows/pin-system-tests\.yaml@refs/heads/(master|test/v.+) + ref: refs/heads/(master|release/v.+) + job_workflow_ref: DataDog/dd-trace-java/\.github/workflows/pin-system-tests\.yaml@refs/heads/(master|release/v.+) permissions: contents: write diff --git a/.github/workflows/pin-system-tests.yaml b/.github/workflows/pin-system-tests.yaml index 4a49a34276c..5548996d836 100644 --- a/.github/workflows/pin-system-tests.yaml +++ b/.github/workflows/pin-system-tests.yaml @@ -11,9 +11,20 @@ on: create: jobs: + # TODO: Remove this job after confirming the github.ref when a release branch is created + print-github-ref: + name: "Print full github.ref" + runs-on: ubuntu-latest + steps: + - name: Print github.ref + run: | + echo "github.ref: ${{ github.ref }}" + pin-system-tests: name: "Pin system tests" - if: github.event_name != 'create' || contains(github.ref, 'test/v') + needs: + - print-github-ref + if: github.event_name != 'create' || contains(github.ref, 'release/v') runs-on: ubuntu-latest permissions: contents: write @@ -25,11 +36,6 @@ jobs: scope: DataDog/dd-trace-java policy: self.pin-system-tests.create-pr - # temporary - - name: Print github.ref - run: | - echo "github.ref: ${{ github.ref }}" - - name: Define base branch id: define-base-branch run: | From 93bbeba41852b3b5226b010fafa4faaa94b92328 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 7 Jan 2026 09:20:48 -0500 Subject: [PATCH 2/3] Remove dependency --- .github/workflows/pin-system-tests.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pin-system-tests.yaml b/.github/workflows/pin-system-tests.yaml index 5548996d836..ca918307439 100644 --- a/.github/workflows/pin-system-tests.yaml +++ b/.github/workflows/pin-system-tests.yaml @@ -22,8 +22,6 @@ jobs: pin-system-tests: name: "Pin system tests" - needs: - - print-github-ref if: github.event_name != 'create' || contains(github.ref, 'release/v') runs-on: ubuntu-latest permissions: From 1d30ce2a2f3751f29d6fff4bc9d0c56737973597 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 7 Jan 2026 09:21:50 -0500 Subject: [PATCH 3/3] Fix comment --- .github/workflows/pin-system-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pin-system-tests.yaml b/.github/workflows/pin-system-tests.yaml index ca918307439..878527d7ae8 100644 --- a/.github/workflows/pin-system-tests.yaml +++ b/.github/workflows/pin-system-tests.yaml @@ -7,7 +7,7 @@ on: description: 'The minor release branch name (e.g. release/v1.54.x)' required: true type: string - # run workflow when a release branch is created + # run workflow when any branch is created create: jobs: