Skip to content

Commit caf5d71

Browse files
Bump OpenSearch Core main branch to 3.0.0 and update key id for native plugin checks (#18039)
* Bump OpenSearch Core main branch to 3.0.0 Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Bump CHANGELOG 3.0 Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Update release@opensearch.org key id in 3.0 and above Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> --------- Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
1 parent 54e02a7 commit caf5d71

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.github/workflows/benchmark-pull-request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
echo "PR_NUMBER=${{ github.event.issue.number }}" >> $GITHUB_ENV
2323
echo "REPOSITORY=${{ github.event.repository.full_name }}" >> $GITHUB_ENV
2424
OPENSEARCH_VERSION=$(awk -F '=' '/^opensearch[[:space:]]*=/ {gsub(/[[:space:]]/, "", $2); print $2}' buildSrc/version.properties)
25-
echo "OPENSEARCH_VERSION=$OPENSEARCH_VERSION-beta1" >> $GITHUB_ENV
25+
echo "OPENSEARCH_VERSION=$OPENSEARCH_VERSION" >> $GITHUB_ENV
2626
major_version=$(echo $OPENSEARCH_VERSION | cut -d'.' -f1)
2727
echo "OPENSEARCH_MAJOR_VERSION=$major_version" >> $GITHUB_ENV
2828
echo "USER_TAGS=pull_request_number:${{ github.event.issue.number }},repository:OpenSearch" >> $GITHUB_ENV
@@ -147,7 +147,7 @@ jobs:
147147
distribution: 'temurin'
148148
- name: Build and Assemble OpenSearch from PR
149149
run: |
150-
./gradlew :distribution:archives:linux-tar:assemble -Dbuild.snapshot=false -Dbuild.version_qualifier=beta1
150+
./gradlew :distribution:archives:linux-tar:assemble -Dbuild.snapshot=false
151151
- name: Configure AWS credentials
152152
uses: aws-actions/configure-aws-credentials@v4
153153
with:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ jobs:
3737
export SONATYPE_PASSWORD=$(aws secretsmanager get-secret-value --secret-id maven-snapshots-password --query SecretString --output text)
3838
echo "::add-mask::$SONATYPE_USERNAME"
3939
echo "::add-mask::$SONATYPE_PASSWORD"
40-
./gradlew publishNebulaPublicationToSnapshotsRepository -Dbuild.version_qualifier=beta1
40+
./gradlew publishNebulaPublicationToSnapshotsRepository

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
88
- Add multi-threaded writer support in pull-based ingestion ([#17912](https://github.com/opensearch-project/OpenSearch/pull/17912))
99
- Unset discovery nodes for every transport node actions request ([#17682](https://github.com/opensearch-project/OpenSearch/pull/17682))
1010
- Implement parallel shard refresh behind cluster settings ([#17782](https://github.com/opensearch-project/OpenSearch/pull/17782))
11+
- Bump OpenSearch Core main branch to 3.0.0 ([#18039](https://github.com/opensearch-project/OpenSearch/pull/18039))
1112

1213
### Changed
1314
- Change the default max header size from 8KB to 16KB. ([#18024](https://github.com/opensearch-project/OpenSearch/pull/18024))

distribution/tools/plugin-cli/src/main/java/org/opensearch/tools/cli/plugin/InstallPluginCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ private Path downloadAndValidate(
602602

603603
/**
604604
* Verify the signature of the downloaded plugin ZIP. The signature is obtained from the source of the downloaded plugin by appending
605-
* ".sig" to the URL. It is expected that the plugin is signed with the OpenSearch signing key with ID C2EE2AF6542C03B4.
605+
* ".sig" to the URL. It is expected that the plugin is signed with the OpenSearch Release signing key with ID 4E9275EE6BA2427F for 3.0.0 or above.
606606
*
607607
* @param zip the path to the downloaded plugin ZIP
608608
* @param urlString the URL source of the downloade plugin ZIP
@@ -663,7 +663,7 @@ InputStream pluginZipInputStream(final Path zip) throws IOException {
663663
* @return the public key ID
664664
*/
665665
String getPublicKeyId() {
666-
return "C2EE2AF6542C03B4";
666+
return "4E9275EE6BA2427F";
667667
}
668668

669669
/**

0 commit comments

Comments
 (0)