-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '6.11.z' into cherry-pick-pr-815
- Loading branch information
Showing
17 changed files
with
263 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| addAssignees: author |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| name: 'Auto Assign' | ||
|
|
||
| on: | ||
| pull_request_target: | ||
| types: | ||
| - opened | ||
| - ready_for_review | ||
| - reopened | ||
| - synchronize | ||
|
|
||
|
|
||
| jobs: | ||
| add-assignees: # This needed to create the gh issue in case of failed auto-cherry-pick | ||
| name: Add author to assignee | ||
| if: "!contains(github.event.pull_request.labels.*.name, 'Auto_Cherry_Picked')" | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: kentaro-m/[email protected] | ||
| with: | ||
| repo-token: "${{ secrets.CHERRYPICK_PAT || github.token }}" | ||
| configuration-path: ".github/auto_assign.yml" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,38 +6,103 @@ on: | |
| types: | ||
| - closed | ||
|
|
||
| # Github & Parent PR Env vars | ||
| env: | ||
| assignee: ${{ github.event.pull_request.assignee.login }} | ||
| title: ${{ github.event.pull_request.title }} | ||
| number: ${{ github.event.number }} | ||
|
|
||
| jobs: | ||
| branch-matrix: | ||
| if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'CherryPick') | ||
| name: Generate a branch matrix to apply cherrypicks | ||
|
|
||
| # Pre-Requisites for Auto Cherrypicking | ||
| find-the-parent-prt-comment: | ||
| name: Find & Save last PRT comment of Parent PR | ||
| runs-on: ubuntu-latest | ||
| outputs: | ||
| branches: ${{ steps.set-matrix.outputs.branches }} | ||
| prt_comment: ${{steps.fc.outputs.comment-body}} | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - name: Find Comment | ||
| uses: peter-evans/find-comment@v2 | ||
| id: fc | ||
| with: | ||
| fetch-depth: 0 | ||
| - id: set-matrix | ||
| run: echo "::set-output name=branches::$(git branch -rl --sort=-authordate 'origin/6.*.z' --format='%(refname:lstrip=-1)' | head -n2 | jq -cnR '[inputs | select(length>0)]')" | ||
| auto_cherry_picking: | ||
| issue-number: ${{ env.number }} | ||
| body-includes: "trigger: test-robottelo" | ||
|
|
||
| # Auto CherryPicking and Failure Recording | ||
| auto-cherry-pick: | ||
| if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'CherryPick') | ||
| name: Auto Cherry picking | ||
| needs: branch-matrix | ||
| name: Auto Cherry Pick to labeled branches | ||
| needs: find-the-parent-prt-comment | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| to_branch: ${{ fromJson(needs.branch-matrix.outputs.branches) }} | ||
| label: ${{ github.event.pull_request.labels.*.name }} | ||
|
|
||
| steps: | ||
| - name: Checkout Airgun | ||
| uses: actions/checkout@v3 | ||
| ## Airgun Repo Checkout | ||
| - uses: actions/checkout@v3 | ||
| if: ${{ startsWith(matrix.label, '6.') && matrix.label != github.base_ref }} | ||
| with: | ||
| fetch-depth: 0 | ||
| if: matrix.to_branch != github.base_ref | ||
| - name: Cherry pick into ${{ matrix.to_branch }} | ||
| uses: carloscastrojumo/[email protected] | ||
|
|
||
| ## CherryPicking and AutoMerging | ||
| - name: Cherrypicking to zStream branch | ||
| id: cherrypick | ||
| if: ${{ startsWith(matrix.label, '6.') && matrix.label != github.base_ref }} | ||
| uses: jyejare/github-cherry-pick-action@main | ||
| with: | ||
| branch: ${{ matrix.to_branch }} | ||
| token: ${{ secrets.CHERRYPICK_PAT }} | ||
| branch: ${{ matrix.label }} | ||
| labels: | | ||
| Auto_Cherry_Picked | ||
| # skipping PRs remote target_branch from cherrypicking into itself | ||
| if: matrix.to_branch != github.base_ref | ||
| ${{ matrix.label }} | ||
| No-CherryPick | ||
| assignees: ${{ env.assignee }} | ||
|
|
||
| - name: Add Parent PR's PRT comment to Auto_Cherry_Picked PR's | ||
| id: add-parent-prt-comment | ||
| if: ${{ always() && steps.cherrypick.outcome == 'success' }} | ||
| uses: mshick/add-pr-comment@v2 | ||
| with: | ||
| issue: ${{ steps.cherrypick.outputs.number }} | ||
| message: ${{ needs.find-the-parent-prt-comment.outputs.prt_comment }} | ||
| repo-token: ${{ secrets.CHERRYPICK_PAT }} | ||
|
|
||
| - name: is autoMerging enabled for Auto CherryPicked PRs ? | ||
| if: ${{ always() && steps.cherrypick.outcome == 'success' && contains(github.event.pull_request.labels.*.name, 'AutoMerge_Cherry_Picked') }} | ||
| uses: actions/github-script@v6 | ||
| with: | ||
| github-token: ${{ secrets.CHERRYPICK_PAT }} | ||
| script: | | ||
| github.rest.issues.addLabels({ | ||
| issue_number: ${{ steps.cherrypick.outputs.number }}, | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| labels: ["AutoMerge_Cherry_Picked"] | ||
| }) | ||
| ## Failure Logging to issues and GChat Group | ||
| - name: Create Github issue on cherrypick failure | ||
| id: create-issue | ||
| if: ${{ always() && steps.cherrypick.outcome == 'failure' }} | ||
| uses: dacbd/create-issue-action@main | ||
| with: | ||
| token: ${{ secrets.CHERRYPICK_PAT }} | ||
| title: "[Failed-AutoCherryPick] - ${{ env.title }}" | ||
| body: | | ||
| #### Auto-Cherry-Pick WorkFlow Failure: | ||
| - To Branch: ${{ matrix.label }} | ||
| - [Failed Cherrypick Action](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) | ||
| - [Parent Pull Request](https://github.com/${{ github.repository }}/pull/${{ github.event.number }}) | ||
| labels: Failed_AutoCherryPick,${{ matrix.label }} | ||
| assignees: ${{ env.assignee }} | ||
| - name: Send Google Chat notification on cherrypick failure | ||
| id: google-chat-notification | ||
| if: ${{ always() && steps.cherrypick.outcome == 'failure' }} | ||
| uses: omkarkhatavkar/google-chat-notification@master | ||
| with: | ||
| name: ${{ env.title }} | ||
| url: ${{ secrets.GCHAT_REVIEWERS_WEBHOOK }} | ||
| issue_url: ${{ steps.create-issue.outputs.html_url }} | ||
| author: ${{ env.assignee }} | ||
| status: failure | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| name: automerge auto-cherry-picked pr's | ||
| on: | ||
| pull_request_target: | ||
| types: | ||
| - labeled | ||
| - unlabeled | ||
| - edited | ||
| - ready_for_review | ||
| branches-ignore: | ||
| - master | ||
| pull_request_review: | ||
| types: | ||
| - submitted | ||
| branches-ignore: | ||
| - master | ||
| check_suite: | ||
| types: | ||
| - completed | ||
| branches-ignore: | ||
| - master | ||
|
|
||
|
|
||
| jobs: | ||
| automerge: | ||
| name: Automerge auto-cherry-picked pr | ||
| if: contains(github.event.pull_request.labels.*.name, 'AutoMerge_Cherry_Picked') && contains(github.event.pull_request.labels.*.name, 'Auto_Cherry_Picked') | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - id: find-prt-comment | ||
| name: Find the prt comment | ||
| uses: peter-evans/find-comment@v2 | ||
| with: | ||
| issue-number: ${{ github.event.number }} | ||
| body-includes: "trigger: test-robottelo" | ||
| direction: last | ||
|
|
||
| - name: Fail automerge if PRT was not initiated | ||
| if: steps.find-prt-comment.outputs.comment-body == '' | ||
| run: | | ||
| echo "::error PRT comment not added the PR" | ||
| - name: Wait for PRT checks to get initiated | ||
| run: | | ||
| echo "Waiting for ~ 10 mins, PRT to be initiated." && sleep 600 | ||
| - name: Wait for other status checks to Pass | ||
| id: waitforstatuschecks | ||
| uses: lewagon/[email protected] | ||
| with: | ||
| ref: ${{ github.head_ref }} | ||
| repo-token: ${{ secrets.CHERRYPICK_PAT }} | ||
| wait-interval: 60 | ||
| running-workflow-name: 'Automerge auto-cherry-picked pr' | ||
| allowed-conclusions: success,skipped | ||
|
|
||
| - name: is PRT check Passed ? | ||
| run: | | ||
| api_endpoint="https://api.github.com/repos/${{github.repository}}/statuses/${{ github.head_ref }}" | ||
| function get_status() { | ||
| curl -s "$api_endpoint" | jq '[.[] | .state] | .[0]' | ||
| } | ||
| function get_context() { | ||
| curl -s "$api_endpoint" | jq '[.[] | .context] | .[0]' | ||
| } | ||
| statuses_length=$(curl -s $api_endpoint | jq 'length') | ||
| if [ $statuses_length -eq 0 ]; then | ||
| echo "PRT failed to start ! Stopping." | ||
| exit 1 | ||
| fi | ||
| status=$(get_status) | ||
| context=$(get_context) | ||
| if [ "$context" != "Robottelo-Runner" ]; then | ||
| echo "::error Failed to get Robottelo-Runner status" | ||
| exit 1 | ||
| fi | ||
| counter=0 | ||
| echo "Waiting for PRT to complete....." | ||
| while [ "$status" != "success" ] && [ "$status" != "failure" ]; do | ||
| if [ $counter -gt 20 ]; then | ||
| echo "PRT Timeout" | ||
| exit 1 | ||
| fi | ||
| sleep 300 | ||
| status=$(get_status) | ||
| echo "Robottelo-Runner : $status" | ||
| counter=$((counter+1)) | ||
| done | ||
| if [ "$status" == "success" ]; then | ||
| echo "PRT Passed Successfully!" | ||
| else | ||
| echo "Robottelo-Runner : $status" | ||
| echo "::error PRT failed" | ||
| exit 1 | ||
| fi | ||
| - id: automerge | ||
| name: Auto merge of cherry-picked PRs. | ||
| uses: "pascalgn/[email protected]" | ||
| if: steps.waitforstatuschecks.outputs.status == 'success' | ||
| env: | ||
| GITHUB_TOKEN: "${{ secrets.CHERRYPICK_PAT }}" | ||
| MERGE_LABELS: "AutoMerge_Cherry_Picked, Auto_Cherry_Picked" | ||
| MERGE_METHOD: "squash" | ||
| MERGE_RETRIES: 5 | ||
| MERGE_RETRY_SLEEP: 900000 | ||
| BASE_BRANCHES: "master" # avoid automerge branch | ||
|
|
||
| - name: Auto Merge Status | ||
| run: | | ||
| if [ "${{ steps.automerge.outputs.mergeResult }}" == 'merged' ]; then | ||
| echo "Pull request ${{ steps.automerge.outputs.pullRequestNumber }} is Auto Merged !" | ||
| else | ||
| echo "::error Auto Merge for Pull request failed !" | ||
| exit 1 | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.