Skip to content

Commit aad7d7e

Browse files
Merge branch 'main' of github.com:opensearch-project/OpenSearch
2 parents d49d0e5 + 8cfde6c commit aad7d7e

5,661 files changed

Lines changed: 95637 additions & 37554 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ci/bwcVersions

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ BWC_VERSION:
1919
- "2.7.0"
2020
- "2.7.1"
2121
- "2.8.0"
22+
- "2.8.1"
23+
- "2.9.0"
24+
- "2.9.1"
25+
- "2.10.0"

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @reta @anasalkouz @andrross @reta @Bukhtawar @CEHENKLE @dblock @gbbafna @setiah @kartg @kotwanikunal @mch2 @nknize @owaiskazi19 @Rishikesh1159 @ryanbogan @saratvemulapalli @shwetathareja @dreamer-89 @tlfeng @VachaShah @dbwiddis
1+
* @reta @anasalkouz @andrross @reta @Bukhtawar @CEHENKLE @dblock @gbbafna @setiah @kartg @kotwanikunal @mch2 @nknize @owaiskazi19 @Rishikesh1159 @ryanbogan @saratvemulapalli @shwetathareja @dreamer-89 @tlfeng @VachaShah @dbwiddis @sachinpkale @sohami @msfroh

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ updates:
77
labels:
88
- "dependabot"
99
- "dependencies"
10+
- directory: /
11+
open-pull-requests-limit: 1
12+
package-ecosystem: "github-actions"
13+
schedule:
14+
interval: "weekly"
15+
labels:
16+
- "dependabot"
17+
- "dependencies"
1018
- directory: /benchmarks/
1119
open-pull-requests-limit: 1
1220
package-ecosystem: gradle

.github/workflows/add-untriaged.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66

77
jobs:
88
apply-label:
9+
if: github.repository == 'opensearch-project/OpenSearch'
910
runs-on: ubuntu-latest
1011
steps:
1112
- uses: actions/github-script@v6

.github/workflows/backport.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ jobs:
3333
installation_id: 22958780
3434

3535
- name: Backport
36-
uses: VachaShah/backport@v2.1.0
36+
uses: VachaShah/backport@v2.2.0
3737
with:
3838
github_token: ${{ steps.github_app_token.outputs.token }}
3939
head_template: backport/backport-<%= number %>-to-<%= base %>
40+
failure_labels: backport-failed

.github/workflows/changelog_verifier.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
jobs:
77
# Enforces the update of a changelog file on every pull request
88
verify-changelog:
9+
if: github.repository == 'opensearch-project/OpenSearch'
910
runs-on: ubuntu-latest
1011
steps:
1112
- uses: actions/checkout@v3
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
name: Check Compatibility
3+
4+
on:
5+
pull_request_target
6+
7+
jobs:
8+
check-compatibility:
9+
if: github.repository == 'opensearch-project/OpenSearch'
10+
permissions:
11+
contents: read
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v3
15+
with:
16+
ref: ${{ github.event.pull_request.head.sha }}
17+
18+
- name: Run compatibility task
19+
run: ./gradlew checkCompatibility -i | tee $HOME/gradlew-check.out
20+
21+
- name: Get results
22+
run: |
23+
echo '## Compatibility status:' > "${{ github.workspace }}/results.txt"
24+
echo "Checks if related components are compatible with change $(git rev-parse --short HEAD)" >> "${{ github.workspace }}/results.txt"
25+
echo "### Incompatible components" >> "${{ github.workspace }}/results.txt" && grep -e 'Incompatible component' $HOME/gradlew-check.out | sed -e 's/Incompatible component: \[\(.*\)\]/- \1/' >> "${{ github.workspace }}/results.txt"
26+
echo "### Skipped components" >> "${{ github.workspace }}/results.txt" && grep -e 'Skipped component' $HOME/gradlew-check.out | sed -e 's/Skipped component: \[\(.*\)\]/- \1/' >> "${{ github.workspace }}/results.txt"
27+
echo "### Compatible components" >> "${{ github.workspace }}/results.txt" && grep -e 'Compatible component' $HOME/gradlew-check.out | sed -e 's/Compatible component: \[\(.*\)\]/- \1/' >> "${{ github.workspace }}/results.txt"
28+
29+
- name: Upload results
30+
uses: actions/upload-artifact@v3
31+
with:
32+
name: results.txt
33+
path: ${{ github.workspace }}/results.txt
34+
35+
add-comment:
36+
needs: [check-compatibility]
37+
permissions:
38+
pull-requests: write
39+
runs-on: ubuntu-latest
40+
steps:
41+
- name: Download results
42+
uses: actions/download-artifact@v3
43+
with:
44+
name: results.txt
45+
46+
- name: Add comment on the PR
47+
uses: peter-evans/create-or-update-comment@v3
48+
with:
49+
issue-number: ${{ github.event.number }}
50+
body-path: results.txt

.github/workflows/gradle-check.yml

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ permissions:
1313

1414
jobs:
1515
gradle-check:
16+
if: github.repository == 'opensearch-project/OpenSearch'
1617
permissions:
1718
contents: read # to fetch code (actions/checkout)
1819
pull-requests: write # to create or update comment (peter-evans/create-or-update-comment)
@@ -22,52 +23,52 @@ jobs:
2223
timeout-minutes: 130
2324
steps:
2425
- name: Checkout OpenSearch repo
25-
uses: actions/checkout@v2
26+
uses: actions/checkout@v3
2627
with:
2728
ref: ${{ github.event.pull_request.head.sha }}
2829

2930
- name: Setup environment variables (PR)
3031
if: github.event_name == 'pull_request_target'
3132
run: |
32-
echo "pr_from_sha=$(jq --raw-output .pull_request.head.sha $GITHUB_EVENT_PATH)" >> $GITHUB_ENV
33-
echo "pr_from_clone_url=$(jq --raw-output .pull_request.head.repo.clone_url $GITHUB_EVENT_PATH)" >> $GITHUB_ENV
34-
echo "pr_to_clone_url=$(jq --raw-output .pull_request.base.repo.clone_url $GITHUB_EVENT_PATH)" >> $GITHUB_ENV
35-
echo "pr_title=$(jq --raw-output .pull_request.title $GITHUB_EVENT_PATH)" >> $GITHUB_ENV
36-
echo "pr_number=$(jq --raw-output .pull_request.number $GITHUB_EVENT_PATH)" >> $GITHUB_ENV
33+
echo "pr_from_sha=$(jq --raw-output .pull_request.head.sha $GITHUB_EVENT_PATH)" >> $GITHUB_ENV
34+
echo "pr_from_clone_url=$(jq --raw-output .pull_request.head.repo.clone_url $GITHUB_EVENT_PATH)" >> $GITHUB_ENV
35+
echo "pr_to_clone_url=$(jq --raw-output .pull_request.base.repo.clone_url $GITHUB_EVENT_PATH)" >> $GITHUB_ENV
36+
echo "pr_title=$(jq --raw-output .pull_request.title $GITHUB_EVENT_PATH)" >> $GITHUB_ENV
37+
echo "pr_number=$(jq --raw-output .pull_request.number $GITHUB_EVENT_PATH)" >> $GITHUB_ENV
3738
3839
- name: Setup environment variables (Push)
3940
if: github.event_name == 'push'
4041
run: |
41-
repo_url="https://github.com/opensearch-project/OpenSearch"
42-
ref_id=$(git rev-parse HEAD)
43-
branch_name=$(git rev-parse --abbrev-ref HEAD)
44-
echo "branch_name=$branch_name" >> $GITHUB_ENV
45-
echo "pr_from_sha=$ref_id" >> $GITHUB_ENV
46-
echo "pr_from_clone_url=$repo_url" >> $GITHUB_ENV
47-
echo "pr_to_clone_url=$repo_url" >> $GITHUB_ENV
48-
echo "pr_title=Push trigger $branch_name $ref_id $repo_url" >> $GITHUB_ENV
49-
echo "pr_number=Null" >> $GITHUB_ENV
42+
repo_url="https://github.com/opensearch-project/OpenSearch"
43+
ref_id=$(git rev-parse HEAD)
44+
branch_name=$(git rev-parse --abbrev-ref HEAD)
45+
echo "branch_name=$branch_name" >> $GITHUB_ENV
46+
echo "pr_from_sha=$ref_id" >> $GITHUB_ENV
47+
echo "pr_from_clone_url=$repo_url" >> $GITHUB_ENV
48+
echo "pr_to_clone_url=$repo_url" >> $GITHUB_ENV
49+
echo "pr_title=Push trigger $branch_name $ref_id $repo_url" >> $GITHUB_ENV
50+
echo "pr_number=Null" >> $GITHUB_ENV
5051
5152
- name: Checkout opensearch-build repo
52-
uses: actions/checkout@v2
53+
uses: actions/checkout@v3
5354
with:
5455
repository: opensearch-project/opensearch-build
5556
ref: main
5657
path: opensearch-build
5758

5859
- name: Trigger jenkins workflow to run gradle check
5960
run: |
60-
set -e
61-
set -o pipefail
62-
bash opensearch-build/scripts/gradle/gradle-check.sh ${{ secrets.JENKINS_GRADLE_CHECK_GENERIC_WEBHOOK_TOKEN }} | tee -a gradle-check.log
61+
set -e
62+
set -o pipefail
63+
bash opensearch-build/scripts/gradle/gradle-check.sh ${{ secrets.JENKINS_GRADLE_CHECK_GENERIC_WEBHOOK_TOKEN }} | tee -a gradle-check.log
6364
6465
- name: Setup Result Status
6566
if: always()
6667
run: |
67-
WORKFLOW_URL=`cat gradle-check.log | grep 'WORKFLOW_URL' | awk '{print $2}'`
68-
RESULT=`cat gradle-check.log | grep 'Result:' | awk '{print $2}'`
69-
echo "workflow_url=$WORKFLOW_URL" >> $GITHUB_ENV
70-
echo "result=$RESULT" >> $GITHUB_ENV
68+
WORKFLOW_URL=`cat gradle-check.log | grep 'WORKFLOW_URL' | awk '{print $2}'`
69+
RESULT=`cat gradle-check.log | grep 'Result:' | awk '{print $2}'`
70+
echo "workflow_url=$WORKFLOW_URL" >> $GITHUB_ENV
71+
echo "result=$RESULT" >> $GITHUB_ENV
7172
7273
- name: Upload Coverage Report
7374
if: success()
@@ -81,25 +82,25 @@ jobs:
8182
with:
8283
issue-number: ${{ env.pr_number }}
8384
body: |
84-
### Gradle Check (Jenkins) Run Completed with:
85-
* **RESULT:** ${{ env.result }} :white_check_mark:
86-
* **URL:** ${{ env.workflow_url }}
87-
* **CommitID:** ${{ env.pr_from_sha }}
85+
### Gradle Check (Jenkins) Run Completed with:
86+
* **RESULT:** ${{ env.result }} :white_check_mark:
87+
* **URL:** ${{ env.workflow_url }}
88+
* **CommitID:** ${{ env.pr_from_sha }}
8889
8990
- name: Extract Test Failure
9091
if: ${{ github.event_name == 'pull_request_target' && env.result != 'SUCCESS' }}
9192
run: |
92-
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`
93-
if [[ "$TEST_FAILURES" != "" ]]
94-
then
95-
echo "test_failures<<EOF" >> $GITHUB_ENV
96-
echo "" >> $GITHUB_ENV
97-
echo "* **TEST FAILURES:**" >> $GITHUB_ENV
98-
echo '```' >> $GITHUB_ENV
99-
echo "$TEST_FAILURES" >> $GITHUB_ENV
100-
echo '```' >> $GITHUB_ENV
101-
echo "EOF" >> $GITHUB_ENV
102-
fi
93+
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`
94+
if [[ "$TEST_FAILURES" != "" ]]
95+
then
96+
echo "test_failures<<EOF" >> $GITHUB_ENV
97+
echo "" >> $GITHUB_ENV
98+
echo "* **TEST FAILURES:**" >> $GITHUB_ENV
99+
echo '```' >> $GITHUB_ENV
100+
echo "$TEST_FAILURES" >> $GITHUB_ENV
101+
echo '```' >> $GITHUB_ENV
102+
echo "EOF" >> $GITHUB_ENV
103+
fi
103104
104105
- name: Create Comment Flaky
105106
if: ${{ github.event_name == 'pull_request_target' && success() && env.result != 'SUCCESS' }}
@@ -119,12 +120,12 @@ jobs:
119120
with:
120121
issue-number: ${{ env.pr_number }}
121122
body: |
122-
### Gradle Check (Jenkins) Run Completed with:
123-
* **RESULT:** ${{ env.result }} :x: ${{ env.test_failures }}
124-
* **URL:** ${{ env.workflow_url }}
125-
* **CommitID:** ${{ env.pr_from_sha }}
126-
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
127-
Is the failure [a flaky test](https://github.com/opensearch-project/OpenSearch/blob/main/DEVELOPER_GUIDE.md#flaky-tests) unrelated to your change?
123+
### Gradle Check (Jenkins) Run Completed with:
124+
* **RESULT:** ${{ env.result }} :x: ${{ env.test_failures }}
125+
* **URL:** ${{ env.workflow_url }}
126+
* **CommitID:** ${{ env.pr_from_sha }}
127+
Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
128+
Is the failure [a flaky test](https://github.com/opensearch-project/OpenSearch/blob/main/DEVELOPER_GUIDE.md#flaky-tests) unrelated to your change?
128129
129130
- name: Create Issue On Push Failure
130131
if: ${{ github.event_name == 'push' && failure() }}

.github/workflows/links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v2
1414
- name: lychee Link Checker
1515
id: lychee
16-
uses: lycheeverse/lychee-action@v1.2.0
16+
uses: lycheeverse/lychee-action@v1.8.0
1717
with:
1818
args: --accept=200,403,429 --exclude-mail **/*.html **/*.md **/*.txt **/*.json --exclude-file .lychee.excludes
1919
fail: true

.github/workflows/lucene-snapshots.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313

1414
jobs:
1515
publish-snapshots:
16+
if: github.repository == 'opensearch-project/OpenSearch'
1617
runs-on: ubuntu-latest
1718
# These permissions are needed to interact with GitHub's OIDC Token endpoint.
1819
permissions:
@@ -22,7 +23,7 @@ jobs:
2223
steps:
2324
- uses: actions/checkout@v2
2425
- name: Set up JDK 17
25-
uses: actions/setup-java@v2
26+
uses: actions/setup-java@v3
2627
with:
2728
java-version: '17'
2829
distribution: 'adopt'
@@ -49,7 +50,7 @@ jobs:
4950
run: ./gradlew publishJarsPublicationToMavenLocal -Pversion.suffix=snapshot-${{ steps.version.outputs.REVISION }}
5051

5152
- name: Configure AWS credentials
52-
uses: aws-actions/configure-aws-credentials@v1
53+
uses: aws-actions/configure-aws-credentials@v2
5354
with:
5455
role-to-assume: ${{ secrets.LUCENE_SNAPSHOTS_ROLE }}
5556
aws-region: us-west-2

0 commit comments

Comments
 (0)