update config.ini to include jdk 21 + remove jdk swapping

Signed-off-by: Michael Oviedo <[email protected]>
opensearch-project · Jan 27, 2025 · 0dc012c · 0dc012c
1 parent ec150c0
commit 0dc012c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/integ-test.yml b/.github/workflows/integ-test.yml
@@ -47,5 +47,12 @@ jobs:
           java-version: '17'
       - run: echo "JAVA17_HOME=$JAVA_HOME" >> $GITHUB_ENV
 
+      - name: Install JDK 21
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'adopt'
+          java-version: '21'
+      - run: echo "JAVA21_HOME=$JAVA_HOME" >> $GITHUB_ENV
+
       - name: Run the CI build script
         run: bash .ci/build.sh run_it ${{ matrix.python-version }}
diff --git a/osbenchmark/resources/provision_configs/1.0/provision_config_instances/v1/vanilla/config.ini b/osbenchmark/resources/provision_configs/1.0/provision_config_instances/v1/vanilla/config.ini
@@ -16,7 +16,7 @@ jdk.unbundled.release_url = https://artifacts.opensearch.org/releases/bundle/ope
 
 docker_image=opensearchproject/opensearch
 # major version of the JDK that is used to build OpenSearch
-build.jdk = 17
+build.jdk = 21
 # list of JDK major versions that are used to run OpenSearch
 runtime.jdk = 17,16,15,14,13,12,11,8
 runtime.jdk.bundled = true
diff --git a/...nchmark/resources/provision_configs/main/provision_config_instances/v1/vanilla/config.ini b/...nchmark/resources/provision_configs/main/provision_config_instances/v1/vanilla/config.ini
@@ -16,7 +16,7 @@ jdk.unbundled.release_url = https://artifacts.opensearch.org/releases/bundle/ope
 
 docker_image=opensearchproject/opensearch
 # major version of the JDK that is used to build OpenSearch
-build.jdk = 17
+build.jdk = 21
 # list of JDK major versions that are used to run OpenSearch
 runtime.jdk = 17,16,15,14,13,12,11,8
 runtime.jdk.bundled = true