Skip to content

Commit ff3d106

Browse files
ajleong623ajleong623
authored
Merge branch 'main' into cluster-endpoints
Signed-off-by: Anthony Leong <[email protected]>
2 parents b3f2850 + 54b8f05 commit ff3d106

File tree

677 files changed

+26365
-4527
lines changed

Some content is hidden

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

677 files changed

+26365
-4527
lines changed

‎.ci/bwcVersions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@ BWC_VERSION:
4747
- "2.19.2"
4848
- "2.19.3"
4949
- "3.0.0"
50+
- "3.1.0"

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
*.crt binary
1212
*.p12 binary
1313
*.txt text=auto
14+
CHANGELOG.md merge=union

‎.github/benchmark-configs.json

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
5353
},
5454
"id_4": {
55-
"description": "Search only test-procedure for big5, uses snapshot to restore the data for OS-3.0.0",
55+
"description": "Search only test-procedure for big5, uses snapshot to restore the data for OS-3.x",
5656
"supported_major_versions": ["3"],
5757
"cluster-benchmark-configs": {
5858
"SINGLE_NODE_CLUSTER": "true",
@@ -206,7 +206,7 @@
206206
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
207207
},
208208
"id_13": {
209-
"description": "Search only test-procedure for HTTP_LOGS, uses snapshot to restore the data for OS-3.0.0",
209+
"description": "Search only test-procedure for HTTP_LOGS, uses snapshot to restore the data for OS-3.x",
210210
"supported_major_versions": ["3"],
211211
"cluster-benchmark-configs": {
212212
"SINGLE_NODE_CLUSTER": "true",
@@ -221,5 +221,22 @@
221221
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
222222
},
223223
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
224+
},
225+
"id_14": {
226+
"description": "Search only test-procedure for NYC_TAXIS, uses snapshot to restore the data for OS-3.x",
227+
"supported_major_versions": ["3"],
228+
"cluster-benchmark-configs": {
229+
"SINGLE_NODE_CLUSTER": "true",
230+
"MIN_DISTRIBUTION": "true",
231+
"TEST_WORKLOAD": "nyc_taxis",
232+
"WORKLOAD_PARAMS": "{\"snapshot_repo_name\":\"benchmark-workloads-repo-3x\",\"snapshot_bucket_name\":\"benchmark-workload-snapshots\",\"snapshot_region\":\"us-east-1\",\"snapshot_base_path\":\"10.2.1\",\"snapshot_name\":\"nyc_taxis_1_shard\"}",
233+
"CAPTURE_NODE_STAT": "true",
234+
"TEST_PROCEDURE": "restore-from-snapshot"
235+
},
236+
"cluster_configuration": {
237+
"size": "Single-Node",
238+
"data_instance_config": "4vCPU, 32G Mem, 16G Heap"
239+
},
240+
"baseline_cluster_config": "x64-r5.xlarge-1-shard-0-replica-snapshot-baseline"
224241
}
225242
}

‎.github/workflows/dependabot_pr.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
uses: actions/checkout@v4
2222
with:
2323
token: ${{ steps.github_app_token.outputs.token }}
24+
ref: ${{ github.head_ref }}
2425

2526
# See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
2627
- name: Set up JDK 21
@@ -34,7 +35,7 @@ jobs:
3435
./gradlew updateSHAs
3536
3637
- name: Commit the changes
37-
uses: stefanzweifel/git-auto-commit-action@v5
38+
uses: stefanzweifel/git-auto-commit-action@v6
3839
with:
3940
commit_message: Updating SHAs
4041
branch: ${{ github.head_ref }}
@@ -47,7 +48,7 @@ jobs:
4748
./gradlew spotlessApply
4849
4950
- name: Commit the changes
50-
uses: stefanzweifel/git-auto-commit-action@v5
51+
uses: stefanzweifel/git-auto-commit-action@v6
5152
with:
5253
commit_message: Spotless formatting
5354
branch: ${{ github.head_ref }}
@@ -61,7 +62,7 @@ jobs:
6162
version: 'Unreleased 3.x'
6263

6364
- name: Commit the changes
64-
uses: stefanzweifel/git-auto-commit-action@v5
65+
uses: stefanzweifel/git-auto-commit-action@v6
6566
with:
6667
commit_message: "Update changelog"
6768
branch: ${{ github.head_ref }}

‎.github/workflows/detect-breaking-change.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: "Detect Breaking Changes"
22
on:
3-
pull_request:
4-
branches-ignore:
5-
- main # This branch represents a to-be-released version of OpenSearch where breaking changes are allowed
6-
- '3.0' # We must establish a baseline 3.0 release version before adding enforcement
3+
pull_request
74

85
jobs:
96
detect-breaking-change:
@@ -18,7 +15,7 @@ jobs:
1815
with:
1916
cache-disabled: true
2017
arguments: japicmp
21-
gradle-version: 8.11
18+
gradle-version: 8.14
2219
build-root-directory: server
2320
- if: failure()
2421
run: cat server/build/reports/java-compatibility/report.txt

‎.github/workflows/publish-maven-snapshots.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ jobs:
2525
distribution: temurin
2626
java-version: 21
2727

28-
- name: Configure AWS credentials
29-
uses: aws-actions/configure-aws-credentials@v4
28+
- name: Load secret
29+
uses: 1password/load-secrets-action@v2
3030
with:
31-
role-to-assume: ${{ secrets.PUBLISH_SNAPSHOTS_ROLE }}
32-
aws-region: us-east-1
31+
# Export loaded secrets as environment variables
32+
export-env: true
33+
env:
34+
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
35+
SONATYPE_USERNAME: op://opensearch-infra-secrets/maven-central-portal-credentials/username
36+
SONATYPE_PASSWORD: op://opensearch-infra-secrets/maven-central-portal-credentials/password
3337

3438
- name: Publish snapshots to maven
3539
run: |
36-
export SONATYPE_USERNAME=$(aws secretsmanager get-secret-value --secret-id maven-snapshots-username --query SecretString --output text)
37-
export SONATYPE_PASSWORD=$(aws secretsmanager get-secret-value --secret-id maven-snapshots-password --query SecretString --output text)
38-
echo "::add-mask::$SONATYPE_USERNAME"
39-
echo "::add-mask::$SONATYPE_PASSWORD"
4040
./gradlew publishNebulaPublicationToSnapshotsRepository

‎.github/workflows/trigger-manifest-generation.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Trigger manifest generation workflow
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
paths:
7+
- buildSrc/version.properties
8+
9+
jobs:
10+
trigger-manifest-workflow:
11+
if: github.repository == 'opensearch-project/OpenSearch'
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Trigger manifest-update workflow
15+
run: |
16+
echo "Triggering manifest-update workflow at https://build.ci.opensearch.org/job/manifest-update/"
17+
curl -f -X POST https://build.ci.opensearch.org/job/manifest-update/build --user ${{ secrets.JENKINS_GITHUB_USER}}:${{ secrets.JENKINS_GITHUB_USER_TOKEN}}

‎.github/workflows/version.yml

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fi
3030
CURRENT_VERSION_ARRAY=($(echo "$TAG" | tr . '\n'))
3131
BASE=$(IFS=. ; echo "${CURRENT_VERSION_ARRAY[*]:0:2}")
32-
BASE_X=$(IFS=. ; echo "${CURRENT_VERSION_ARRAY[*]:0:1}.x")
32+
MAIN_BRANCH="main"
3333
CURRENT_VERSION=$(IFS=. ; echo "${CURRENT_VERSION_ARRAY[*]:0:3}")
3434
CURRENT_VERSION_UNDERSCORE=$(IFS=_ ; echo "V_${CURRENT_VERSION_ARRAY[*]:0:3}")
3535
CURRENT_VERSION_ARRAY[2]=$((CURRENT_VERSION_ARRAY[2]+1))
@@ -42,7 +42,7 @@ jobs:
4242
fi
4343
echo "TAG=$TAG" >> $GITHUB_ENV
4444
echo "BASE=$BASE" >> $GITHUB_ENV
45-
echo "BASE_X=$BASE_X" >> $GITHUB_ENV
45+
echo "MAIN_BRANCH=$MAIN_BRANCH" >> $GITHUB_ENV
4646
echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV
4747
echo "CURRENT_VERSION_UNDERSCORE=$CURRENT_VERSION_UNDERSCORE" >> $GITHUB_ENV
4848
echo "NEXT_VERSION=$NEXT_VERSION" >> $GITHUB_ENV
@@ -77,33 +77,7 @@ jobs:
7777
7878
- uses: actions/checkout@v4
7979
with:
80-
ref: ${{ env.BASE_X }}
81-
82-
- name: Add Patch Version on Major.X branch
83-
uses: peternied/opensearch-core-version-updater@v1
84-
with:
85-
previous-version: ${{ env.CURRENT_VERSION }}
86-
new-version: ${{ env.NEXT_VERSION }}
87-
update-current: false
88-
89-
- name: Create PR for BASE_X
90-
id: base_x_pr
91-
uses: peter-evans/create-pull-request@v7
92-
with:
93-
base: ${{ env.BASE_X }}
94-
branch: 'create-pull-request/patch-${{ env.BASE_X }}'
95-
commit-message: Add bwc version ${{ env.NEXT_VERSION }}
96-
signoff: true
97-
delete-branch: true
98-
labels: |
99-
autocut
100-
title: '[AUTO] [${{ env.BASE_X }}] Add bwc version ${{ env.NEXT_VERSION }}.'
101-
body: |
102-
I've noticed that a new tag ${{ env.TAG }} was pushed, and added a bwc version ${{ env.NEXT_VERSION }}.
103-
104-
- uses: actions/checkout@v4
105-
with:
106-
ref: main
80+
ref: ${{ env.MAIN_BRANCH }}
10781

10882
- name: Add Patch Version on main branch
10983
uses: peternied/opensearch-core-version-updater@v1
@@ -112,18 +86,18 @@ jobs:
11286
new-version: ${{ env.NEXT_VERSION }}
11387
update-current: false
11488

115-
- name: Create PR for main
116-
id: main_pr
89+
- name: Create PR for MAIN_BRANCH
90+
id: main_branch_pr
11791
uses: peter-evans/create-pull-request@v7
11892
with:
119-
base: main
120-
branch: 'create-pull-request/patch-main'
93+
base: ${{ env.MAIN_BRANCH }}
94+
branch: 'create-pull-request/patch-${{ env.MAIN_BRANCH }}'
12195
commit-message: Add bwc version ${{ env.NEXT_VERSION }}
12296
signoff: true
12397
delete-branch: true
12498
labels: |
12599
autocut
126-
title: '[AUTO] [main] Add bwc version ${{ env.NEXT_VERSION }}.'
100+
title: '[AUTO] [${{ env.MAIN_BRANCH }}] Add bwc version ${{ env.NEXT_VERSION }}.'
127101
body: |
128102
I've noticed that a new tag ${{ env.TAG }} was pushed, and added a bwc version ${{ env.NEXT_VERSION }}.
129103
@@ -139,8 +113,7 @@ jobs:
139113
### Exit Criteria
140114
Review and merged the following pull requests
141115
- [ ] ${{ steps.base_pr.outputs.pull-request-url }}
142-
- [ ] ${{ steps.base_x_pr.outputs.pull-request-url }}
143-
- [ ] ${{ steps.main_pr.outputs.pull-request-url }}
116+
- [ ] ${{ steps.main_branch_pr.outputs.pull-request-url }}
144117
145118
### Additional Context
146119
See project wide guidance on branching and versions [[link]](https://github.com/opensearch-project/.github/blob/main/RELEASING.md).

‎ADMINS.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
## Admins
22

3-
| Admin | GitHub ID | Affiliation |
4-
| --------------- | --------------------------------------- | ----------- |
5-
| Henri Yandell | [hyandell](https://github.com/hyandell) | Amazon |
6-
7-
[This document](https://github.com/opensearch-project/.github/blob/main/ADMINS.md) explains what admins do in this repo. and how they should be doing it. If you're interested in becoming a maintainer, see [MAINTAINERS](MAINTAINERS.md). If you're interested in contributing, see [CONTRIBUTING](CONTRIBUTING.md).
3+
Kindly refer to [ADMINS.md](https://github.com/opensearch-project/.github/blob/main/ADMINS.md) for opensearch-project administrators, their responsibilities in this repository, and their operational procedures. If you're interested in becoming a maintainer, see [MAINTAINERS](MAINTAINERS.md). If you're interested in contributing, see [CONTRIBUTING](CONTRIBUTING.md).

0 commit comments

Comments
 (0)