Skip to content

Commit 2b234f6

Browse files
authored
Fix: CI errors due to ml commons publish with JDK-21 and k-NN rename (#835)
* test CI error Signed-off-by: yuye-aws <yuyezhu@amazon.com> * remove java 11 and 17 for CI workflow Signed-off-by: yuye-aws <yuyezhu@amazon.com> * remove java 11 and 17 for CI workflow Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update changelog Signed-off-by: yuye-aws <yuyezhu@amazon.com> * update changelog Signed-off-by: yuye-aws <yuyezhu@amazon.com> * revert knn rename bug fix Signed-off-by: yuye-aws <yuyezhu@amazon.com> --------- Signed-off-by: yuye-aws <yuyezhu@amazon.com>
1 parent bf2fd5a commit 2b234f6

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

.github/workflows/CI.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
needs: Get-CI-Image-Tag
2424
strategy:
2525
matrix:
26-
java: [11, 17, 21]
26+
java: [21]
2727
os: [ubuntu-latest]
2828

2929
name: Gradle Check Linux
@@ -58,7 +58,7 @@ jobs:
5858
Check-neural-search-windows:
5959
strategy:
6060
matrix:
61-
java: [11, 17, 21]
61+
java: [21]
6262
os: [windows-latest]
6363

6464
name: Gradle Check Windows
@@ -86,7 +86,7 @@ jobs:
8686
needs: Get-CI-Image-Tag
8787
strategy:
8888
matrix:
89-
java: [11, 17, 21]
89+
java: [21]
9090
os: [ubuntu-latest]
9191

9292
name: Pre-commit Linux
@@ -120,7 +120,7 @@ jobs:
120120
Precommit-neural-search-windows:
121121
strategy:
122122
matrix:
123-
java: [11, 17, 21]
123+
java: [21]
124124
os: [windows-latest]
125125

126126
name: Pre-commit Windows

.github/workflows/backwards_compatibility_tests_workflow.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
Restart-Upgrade-BWCTests-NeuralSearch:
1414
strategy:
1515
matrix:
16-
java: [ 11, 17, 21 ]
16+
java: [ 21 ]
1717
os: [ubuntu-latest,windows-latest]
1818
bwc_version : ["2.9.0","2.10.0","2.11.0","2.12.0","2.13.0","2.14.0","2.15.0","2.16.0-SNAPSHOT"]
1919
opensearch_version : [ "3.0.0-SNAPSHOT" ]
@@ -40,7 +40,7 @@ jobs:
4040
Rolling-Upgrade-BWCTests-NeuralSearch:
4141
strategy:
4242
matrix:
43-
java: [ 11, 17, 21 ]
43+
java: [ 21 ]
4444
os: [ubuntu-latest,windows-latest]
4545
bwc_version: [ "2.16.0-SNAPSHOT" ]
4646
opensearch_version: [ "3.0.0-SNAPSHOT" ]

.github/workflows/test_aggregations.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
needs: Get-CI-Image-Tag
2424
strategy:
2525
matrix:
26-
java: [11, 17, 21]
26+
java: [21]
2727
os: [ubuntu-latest]
2828

2929
name: Integ Tests Linux
@@ -53,7 +53,7 @@ jobs:
5353
Check-neural-search-windows:
5454
strategy:
5555
matrix:
56-
java: [11, 17, 21]
56+
java: [21]
5757
os: [windows-latest]
5858

5959
name: Integ Tests Windows

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2424
### Infrastructure
2525
- Add BWC for batch ingestion ([#769](https://github.com/opensearch-project/neural-search/pull/769))
2626
- Add backward test cases for neural sparse two phase processor ([#777](https://github.com/opensearch-project/neural-search/pull/777))
27+
- Fix CI for JDK upgrade towards 21 ([#835](https://github.com/opensearch-project/neural-search/pull/835))
2728
### Documentation
2829
### Maintenance
2930
### Refactoring

0 commit comments

Comments
 (0)