Merge remote-tracking branch 'upstream/main' into allow-wrr-during-de…

…commission

Signed-off-by: Rishab Nahata <[email protected]>

.ci/bwcVersions

@@ -1,47 +1,4 @@
 BWC_VERSION:
- - "7.0.0"
- - "7.0.1"
- - "7.1.0"
- - "7.1.1"
- - "7.2.0"
- - "7.2.1"
- - "7.3.0"
- - "7.3.1"
- - "7.3.2"
- - "7.4.0"
- - "7.4.1"
- - "7.4.2"
- - "7.5.0"
- - "7.5.1"
- - "7.5.2"
- - "7.6.0"
- - "7.6.1"
- - "7.6.2"
- - "7.7.0"
- - "7.7.1"
- - "7.8.0"
- - "7.8.1"
- - "7.9.0"
- - "7.9.1"
- - "7.9.2"
- - "7.9.3"
- - "7.10.0"
- - "7.10.1"
- - "7.10.2"
- - "1.0.0"
- - "1.1.0"
- - "1.2.0"
- - "1.2.1"
- - "1.2.2"
- - "1.2.3"
- - "1.2.4"
- - "1.2.5"
- - "1.3.0"
- - "1.3.1"
- - "1.3.2"
- - "1.3.3"
- - "1.3.4"
- - "1.3.5"
  - "2.0.0"
  - "2.0.1"
  - "2.0.2"
@@ -53,3 +10,5 @@ BWC_VERSION:
  - "2.3.0"
  - "2.3.1"
  - "2.4.0"
+ - "2.4.1"
+ - "2.5.0"

.github/workflows/backport.yml

@@ -7,6 +7,7 @@ on:
 
 jobs:
  backport:
+ if: ${{ contains(github.event.label.name, 'backport') }}
  runs-on: ubuntu-latest
  permissions:
  contents: write
@@ -22,7 +23,7 @@ jobs:
  installation_id: 22958780
 
  - name: Backport
- uses: VachaShah/backport@v1.1.4
+ uses: VachaShah/backport@v2.1.0
  with:
  github_token: ${{ steps.github_app_token.outputs.token }}
- branch_name: backport/backport-${{ github.event.number }}
+ head_template: backport/backport-<%= number %>-to-<%= base %>

.github/workflows/changelog_verifier.yml

@@ -15,4 +15,4 @@ jobs:
 
  - uses: dangoslen/changelog-enforcer@v3
  with:
- skipLabels: "autocut"
+ skipLabels: "autocut, skip-changelog"

.github/workflows/gradle-check.yml

@@ -7,13 +7,16 @@ on:
  - 'dependabot/**'
  pull_request_target:
  types: [opened, synchronize, reopened]
- workflow_run:
- workflows: ["Gradle Precommit"]
- types:
- - completed
+
+permissions:
+ contents: read # to fetch code (actions/checkout)
 
 jobs:
  gradle-check:
+ permissions:
+ contents: read # to fetch code (actions/checkout)
+ pull-requests: write # to create or update comment (peter-evans/create-or-update-comment)
+
  runs-on: ubuntu-latest
  timeout-minutes: 130
  steps:
@@ -71,7 +74,7 @@ jobs:
  files: ./codeCoverage.xml
 
  - name: Create Comment Success
- if: ${{ github.event_name == 'pull_request_target' && success() }}
+ if: ${{ github.event_name == 'pull_request_target' && success() && env.result == 'SUCCESS' }}
  uses: peter-evans/create-or-update-comment@v2
  with:
  issue-number: ${{ env.pr_number }}
@@ -81,15 +84,42 @@ jobs:
  * **URL:** ${{ env.workflow_url }}
  * **CommitID:** ${{ env.pr_from_sha }}
 
+ - name: Extract Test Failure
+ if: ${{ github.event_name == 'pull_request_target' && env.result != 'SUCCESS' }}
+ run: |
+ TEST_FAILURES=`curl -s "${{ env.workflow_url }}/testReport/api/json?tree=suites\[cases\[status,className,name\]\]" | jq -r '.. | objects | select(.status=="FAILED",.status=="REGRESSION") | (.className + "." + .name)' | uniq -c | sort -n -r | head -n 10`
+ if [[ "$TEST_FAILURES" != "" ]]
+ then
+ echo "test_failures<<EOF" >> $GITHUB_ENV
+ echo "" >> $GITHUB_ENV
+ echo "* **TEST FAILURES:**" >> $GITHUB_ENV
+ echo '```' >> $GITHUB_ENV
+ echo "$TEST_FAILURES" >> $GITHUB_ENV
+ echo '```' >> $GITHUB_ENV
+ echo "EOF" >> $GITHUB_ENV
+ fi
+
+ - name: Create Comment Flaky
+ if: ${{ github.event_name == 'pull_request_target' && success() && env.result != 'SUCCESS' }}
+ uses: peter-evans/create-or-update-comment@v2
+ with:
+ issue-number: ${{ env.pr_number }}
+ body: |
+ ### Gradle Check (Jenkins) Run Completed with:
+ * **RESULT:** ${{ env.result }} :grey_exclamation: ${{ env.test_failures }}
+ * **URL:** ${{ env.workflow_url }}
+ * **CommitID:** ${{ env.pr_from_sha }}
+ Please review all [flaky tests](https:/opensearch-project/OpenSearch/blob/main/DEVELOPER_GUIDE.md#flaky-tests) that succeeded after retry and create an issue if one does not already exist to track the flaky failure.
+
  - name: Create Comment Failure
  if: ${{ github.event_name == 'pull_request_target' && failure() }}
  uses: peter-evans/create-or-update-comment@v2
  with:
  issue-number: ${{ env.pr_number }}
  body: |
  ### Gradle Check (Jenkins) Run Completed with:
- * **RESULT:** ${{ env.result }} :x:
+ * **RESULT:** ${{ env.result }} :x: ${{ env.test_failures }}
  * **URL:** ${{ env.workflow_url }}
  * **CommitID:** ${{ env.pr_from_sha }}
- Please examine the workflow log, locate, and copy-paste the failure below, then iterate to green.
+ Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
  Is the failure [a flaky test](https:/opensearch-project/OpenSearch/blob/main/DEVELOPER_GUIDE.md#flaky-tests) unrelated to your change?

.github/workflows/links.yml

@@ -2,6 +2,8 @@ name: Link Checker
 on:
  schedule:
  - cron: '0 0 * * *'
+permissions:
+ contents: read # to fetch code (actions/checkout)
 jobs:
  linkchecker:
  if: github.repository == 'opensearch-project/OpenSearch'

.github/workflows/version.yml

@@ -5,6 +5,7 @@ on:
  tags:
  - '*.*.*'
 
+permissions: {}
 jobs:
  build:
  runs-on: ubuntu-latest