Skip to content

Commit ea426dd

Browse files
authored
Updating integ tests to use current versions of OpenSearch (opensearch-project#305)
Signed-off-by: Govind Kamat <govkamat@amazon.com>
1 parent edcd5ee commit ea426dd

File tree

7 files changed

+25
-8
lines changed

7 files changed

+25
-8
lines changed

.github/workflows/manual-integ.yml

+6
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ jobs:
4444
distribution: 'adopt'
4545
java-version: '16'
4646
- run: echo "JAVA16_HOME=$JAVA_HOME" >> $GITHUB_ENV
47+
- name: Install JDK 17
48+
uses: actions/setup-java@v3
49+
with:
50+
distribution: 'adopt'
51+
java-version: '17'
52+
- run: echo "JAVA17_HOME=$JAVA_HOME" >> $GITHUB_ENV
4753
- name: Run the CI build_it script
4854
run: bash .ci/build.sh build_it ${{ matrix.python-version }}
4955
env:

DEVELOPER_GUIDE.md

+11-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,17 @@ make it
6464

6565
### Important information related to integration tests
6666

67-
If you have multiple JDKs installed, export them to the following format `JAVA(jdk_version)_HOME`. Here is an example of how one would export JDK 8, 11, 15, 16:
67+
To have all the tests run successfully JDK 17 is required, since one of the tests builds the latest version of OpenSearch from source, and the OpenSearch project uses JDK 17 for this purpose.
68+
```
69+
export JAVA_HOME=/path/to/JDK17
70+
71+
```
72+
73+
Note that the `javadoc` executable should be available in the JDK installation.
74+
75+
You could also use one of the following versions instead: 16, 15, 14, 13, 12, 11 or 8. Most of the complement of tests included will work with these.
76+
77+
If you have multiple JDKs installed, export them in the following format `JAVA(jdk_version)_HOME`. Here is an example of how one would export JDK 8, 11, 15, 16:
6878
```
6979
export JAVA8_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_231.jdk/Contents/Home/
7080
export JAVA11_HOME=/Library/Java/JavaVirtualMachines/jdk-11.0.8.jdk/Contents/Home

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ docs-clean:
8585

8686
# Avoid conflicts between .pyc/pycache related files created by local Python interpreters and other interpreters in Docker
8787
python-caches-clean:
88-
-@find . -name "__pycache__" -exec rm -rf -- \{\} \;
89-
-@find . -name ".pyc" -exec rm -rf -- \{\} \;
88+
-@find . -name "__pycache__" -prune -exec rm -rf -- \{\} \;
89+
-@find . -name ".pyc" -prune -exec rm -rf -- \{\} \;
9090

9191
# Force recreation of the virtual environment used by tox.
9292
#

it/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
from osbenchmark.utils import process
3737

3838
CONFIG_NAMES = ["in-memory-it", "os-it"]
39-
DISTRIBUTIONS = ["1.0.0", "1.0.1"]
39+
DISTRIBUTIONS = ["1.3.9", "2.5.0"]
4040
WORKLOADS = ["geonames", "nyc_taxis", "http_logs", "nested"]
4141
ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
4242

@@ -194,7 +194,7 @@ def __str__(self):
194194

195195

196196
class OsMetricsStore:
197-
VERSION = "1.0.1"
197+
VERSION = "1.3.9"
198198

199199
def __init__(self):
200200
self.cluster = TestCluster("in-memory-it")

osbenchmark/resources/provision_configs/1.0/provision_config_instances/v1/vanilla/config.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ docker_image=opensearchproject/opensearch
1818
# major version of the JDK that is used to build OpenSearch
1919
build.jdk = 12
2020
# list of JDK major versions that are used to run OpenSearch
21-
runtime.jdk = 12,11,8
21+
runtime.jdk = 17,16,15,14,13,12,11,8
2222
runtime.jdk.bundled = true

osbenchmark/resources/provision_configs/main/provision_config_instances/v1/vanilla/config.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jdk.unbundled.release_url = https://artifacts.opensearch.org/releases/bundle/ope
1616

1717
docker_image=opensearchproject/opensearch
1818
# major version of the JDK that is used to build OpenSearch
19-
build.jdk = 16
19+
build.jdk = 17
2020
# list of JDK major versions that are used to run OpenSearch
21-
runtime.jdk = 16,15,14,13,12,11
21+
runtime.jdk = 17,16,15,14,13,12,11,8
2222
runtime.jdk.bundled = true

tox.ini

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ deps=
1616
pytest
1717
passenv =
1818
HOME
19+
JAVA_HOME
1920
JAVA8_HOME
2021
JAVA9_HOME
2122
JAVA10_HOME

0 commit comments

Comments
 (0)