From 45eb7c2b53be3888743f124f44c6f9be486884bf Mon Sep 17 00:00:00 2001 From: Victor Diez Date: Fri, 3 Jul 2026 20:07:58 +0200 Subject: [PATCH 1/4] CLP-129 Normalize Jira automation workflows --- .github/workflows/PullRequestClosed.yml | 6 +++--- .github/workflows/PullRequestCreated.yml | 3 ++- .github/workflows/RequestReview.yml | 2 +- .github/workflows/SubmitReview.yml | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/PullRequestClosed.yml b/.github/workflows/PullRequestClosed.yml index a020047..8285001 100644 --- a/.github/workflows/PullRequestClosed.yml +++ b/.github/workflows/PullRequestClosed.yml @@ -5,9 +5,9 @@ on: types: [closed] jobs: - PullRequestMerged_job: - name: Pull Request Merged - runs-on: github-ubuntu-latest-s + PullRequestClosed_job: + name: Pull Request Closed + runs-on: sonar-xs permissions: id-token: write pull-requests: read diff --git a/.github/workflows/PullRequestCreated.yml b/.github/workflows/PullRequestCreated.yml index 32fbe0c..28ccbf3 100644 --- a/.github/workflows/PullRequestCreated.yml +++ b/.github/workflows/PullRequestCreated.yml @@ -7,12 +7,13 @@ on: jobs: PullRequestCreated_job: name: Pull Request Created - runs-on: github-ubuntu-latest-s + runs-on: sonar-xs permissions: id-token: write # For external PR, ticket should be created manually if: | github.event.pull_request.head.repo.full_name == github.repository + && github.event.sender.type != 'Bot' steps: - id: secrets uses: SonarSource/vault-action-wrapper@v3 diff --git a/.github/workflows/RequestReview.yml b/.github/workflows/RequestReview.yml index eb1425d..539acd4 100644 --- a/.github/workflows/RequestReview.yml +++ b/.github/workflows/RequestReview.yml @@ -7,7 +7,7 @@ on: jobs: RequestReview_job: name: Request review - runs-on: github-ubuntu-latest-s + runs-on: sonar-xs permissions: id-token: write # For external PR, ticket should be moved manually diff --git a/.github/workflows/SubmitReview.yml b/.github/workflows/SubmitReview.yml index 08472bd..7d1a1a6 100644 --- a/.github/workflows/SubmitReview.yml +++ b/.github/workflows/SubmitReview.yml @@ -7,7 +7,7 @@ on: jobs: SubmitReview_job: name: Submit Review - runs-on: github-ubuntu-latest-s + runs-on: sonar-xs permissions: id-token: write # For external PR, ticket should be moved manually From 78065dfacbfd2ae7d85162a3b4c9f94fa5a07888 Mon Sep 17 00:00:00 2001 From: Victor Diez Date: Mon, 6 Jul 2026 14:42:27 +0200 Subject: [PATCH 2/4] CLP-129 Remove bot exclusion from Jira automation workflow --- .github/workflows/PullRequestCreated.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/PullRequestCreated.yml b/.github/workflows/PullRequestCreated.yml index 28ccbf3..376f51b 100644 --- a/.github/workflows/PullRequestCreated.yml +++ b/.github/workflows/PullRequestCreated.yml @@ -13,7 +13,6 @@ jobs: # For external PR, ticket should be created manually if: | github.event.pull_request.head.repo.full_name == github.repository - && github.event.sender.type != 'Bot' steps: - id: secrets uses: SonarSource/vault-action-wrapper@v3 From ba18e62ddb64708723d64529e267050c0261a4c7 Mon Sep 17 00:00:00 2001 From: Victor Diez Date: Tue, 7 Jul 2026 10:47:56 +0200 Subject: [PATCH 3/4] CLP-129 Restore Jira workflow alignment and PR cleanup job --- .github/workflows/PullRequestClosed.yml | 11 +++++++++-- .github/workflows/SubmitReview.yml | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/PullRequestClosed.yml b/.github/workflows/PullRequestClosed.yml index 8285001..5047dc7 100644 --- a/.github/workflows/PullRequestClosed.yml +++ b/.github/workflows/PullRequestClosed.yml @@ -24,5 +24,12 @@ jobs: - uses: sonarsource/gh-action-lt-backlog/PullRequestClosed@v2 with: github-token: ${{secrets.GITHUB_TOKEN}} - jira-user: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_USER }} - jira-token: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_TOKEN }} + jira-user: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_USER }} + jira-token: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_TOKEN }} + + PR_Build_Cleanup: + runs-on: sonar-xs + permissions: + actions: write + steps: + - uses: SonarSource/ci-github-actions/pr_cleanup@v1 diff --git a/.github/workflows/SubmitReview.yml b/.github/workflows/SubmitReview.yml index 7d1a1a6..2906d52 100644 --- a/.github/workflows/SubmitReview.yml +++ b/.github/workflows/SubmitReview.yml @@ -26,5 +26,5 @@ jobs: - uses: sonarsource/gh-action-lt-backlog/SubmitReview@v2 with: github-token: ${{ fromJSON(steps.secrets.outputs.vault).GITHUB_TOKEN }} - jira-user: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_USER }} - jira-token: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_TOKEN }} + jira-user: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_USER }} + jira-token: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_TOKEN }} From 97ab229909adc23d7dcceeb03e40c0acaaa386c5 Mon Sep 17 00:00:00 2001 From: Victor Diez Date: Tue, 7 Jul 2026 20:49:20 +0200 Subject: [PATCH 4/4] CLP-129 Remove PR cleanup changes --- .github/workflows/PullRequestClosed.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/PullRequestClosed.yml b/.github/workflows/PullRequestClosed.yml index 5047dc7..d23ba1c 100644 --- a/.github/workflows/PullRequestClosed.yml +++ b/.github/workflows/PullRequestClosed.yml @@ -26,10 +26,3 @@ jobs: github-token: ${{secrets.GITHUB_TOKEN}} jira-user: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_USER }} jira-token: ${{ fromJSON(steps.secrets.outputs.vault).JIRA_TOKEN }} - - PR_Build_Cleanup: - runs-on: sonar-xs - permissions: - actions: write - steps: - - uses: SonarSource/ci-github-actions/pr_cleanup@v1