Skip to content

Commit 0e2f404

Browse files
shiv0408shiv0408
authored
Merge pull request #17 from opensearch-project/main
Merge 'main' into its_with_publication
2 parents aaffad6 + 2b670cc commit 0e2f404

File tree

145 files changed

+4832
-826
lines changed

Some content is hidden

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

145 files changed

+4832
-826
lines changed

‎.ci/bwcVersions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@ BWC_VERSION:
3838
- "2.16.0"
3939
- "2.16.1"
4040
- "2.17.0"
41+
- "2.17.1"
4142
- "2.18.0"

‎.github/benchmark-configs.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"SINGLE_NODE_CLUSTER": "true",
7676
"MIN_DISTRIBUTION": "true",
7777
"TEST_WORKLOAD": "big5",
78-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-300\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-300\",\"snapshot_name\":\"big5_1_shard\"}",
78+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-300\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-300\",\"snapshot_name\":\"big5_1_shard_ordered\"}",
7979
"CAPTURE_NODE_STAT": "true",
8080
"TEST_PROCEDURE": "restore-from-snapshot"
8181
},
@@ -126,7 +126,7 @@
126126
"SINGLE_NODE_CLUSTER": "true",
127127
"MIN_DISTRIBUTION": "true",
128128
"TEST_WORKLOAD": "big5",
129-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots\",\"snapshot_name\":\"big5_1_shard\"}",
129+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots\",\"snapshot_name\":\"big5_1_shard_ordered\"}",
130130
"CAPTURE_NODE_STAT": "true",
131131
"TEST_PROCEDURE": "restore-from-snapshot"
132132
},
@@ -176,7 +176,7 @@
176176
"MIN_DISTRIBUTION": "true",
177177
"TEST_WORKLOAD": "big5",
178178
"ADDITIONAL_CONFIG": "search.concurrent_segment_search.enabled:true",
179-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-300\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-300\",\"snapshot_name\":\"big5_1_shard\"}",
179+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-300\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-300\",\"snapshot_name\":\"big5_1_shard_ordered\"}",
180180
"CAPTURE_NODE_STAT": "true",
181181
"TEST_PROCEDURE": "restore-from-snapshot"
182182
},
@@ -194,7 +194,7 @@
194194
"MIN_DISTRIBUTION": "true",
195195
"TEST_WORKLOAD": "big5",
196196
"ADDITIONAL_CONFIG": "search.concurrent_segment_search.mode:all",
197-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-300\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-300\",\"snapshot_name\":\"big5_1_shard\"}",
197+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-300\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-300\",\"snapshot_name\":\"big5_1_shard_ordered\"}",
198198
"CAPTURE_NODE_STAT": "true",
199199
"TEST_PROCEDURE": "restore-from-snapshot"
200200
},
@@ -212,7 +212,7 @@
212212
"MIN_DISTRIBUTION": "true",
213213
"TEST_WORKLOAD": "big5",
214214
"ADDITIONAL_CONFIG": "search.concurrent_segment_search.mode:auto",
215-
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-300\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-300\",\"snapshot_name\":\"big5_1_shard\"}",
215+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-300\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"workload-snapshots-300\",\"snapshot_name\":\"big5_1_shard_ordered\"}",
216216
"CAPTURE_NODE_STAT": "true",
217217
"TEST_PROCEDURE": "restore-from-snapshot"
218218
},

‎.github/workflows/assemble.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ jobs:
3232
if: runner.os == 'macos'
3333
continue-on-error: true
3434
run: |
35-
brew install docker colima coreutils
35+
# Force QEMU 9.0.2 usage
36+
curl https://raw.githubusercontent.com/Homebrew/homebrew-core/f1a9cf104a9a51779c7a532b658c490f69974839/Formula/q/qemu.rb > qemu.rb
37+
brew install qemu.rb
38+
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 HOMEBREW_NO_AUTO_UPDATE=1 brew install docker colima coreutils
3639
gtimeout 15m colima start
3740
shell: bash
3841
- name: Run Gradle (assemble)

‎.github/workflows/delete_backport_branch.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,16 @@ on:
77
jobs:
88
delete-branch:
99
runs-on: ubuntu-latest
10+
permissions:
11+
contents: write
1012
if: startsWith(github.event.pull_request.head.ref,'backport/')
1113
steps:
12-
- name: Delete merged branch
13-
uses: SvanBoxel/delete-merged-branch@main
14-
env:
15-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14+
- name: Delete merged branch
15+
uses: actions/github-script@v5
16+
with:
17+
script: |
18+
github.rest.git.deleteRef({
19+
owner: context.repo.owner,
20+
repo: context.repo.repo,
21+
ref: `heads/${context.payload.pull_request.head.ref}`,
22+
})

‎.github/workflows/gradle-check.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
pull_request_target:
99
types: [opened, synchronize, reopened]
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
13+
cancel-in-progress: true
14+
1115
permissions:
1216
contents: read # to fetch code (actions/checkout)
1317

‎.github/workflows/version.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262

6363
- name: Create PR for BASE
6464
id: base_pr
65-
uses: peter-evans/create-pull-request@v6
65+
uses: peter-evans/create-pull-request@v7
6666
with:
6767
base: ${{ env.BASE }}
6868
branch: 'create-pull-request/patch-${{ env.BASE }}'
@@ -88,7 +88,7 @@ jobs:
8888

8989
- name: Create PR for BASE_X
9090
id: base_x_pr
91-
uses: peter-evans/create-pull-request@v6
91+
uses: peter-evans/create-pull-request@v7
9292
with:
9393
base: ${{ env.BASE_X }}
9494
branch: 'create-pull-request/patch-${{ env.BASE_X }}'
@@ -114,7 +114,7 @@ jobs:
114114

115115
- name: Create PR for main
116116
id: main_pr
117-
uses: peter-evans/create-pull-request@v6
117+
uses: peter-evans/create-pull-request@v7
118118
with:
119119
base: main
120120
branch: 'create-pull-request/patch-main'

0 commit comments

Comments
 (0)