Skip to content
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
needs: Get-CI-Image-Tag
strategy:
matrix:
java: [21, 23]
java: [21, 24]
os: [ubuntu-latest]

name: Gradle Check Linux
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
Check-neural-search-windows:
strategy:
matrix:
java: [21, 23]
java: [21, 24]
os: [windows-latest]

name: Gradle Check Windows
Expand All @@ -82,7 +82,7 @@ jobs:
needs: Get-CI-Image-Tag
strategy:
matrix:
java: [21, 23]
java: [21, 24]
os: [ubuntu-latest]

name: Pre-commit Linux
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
needs: Precommit-neural-search-linux
strategy:
matrix:
java: [21, 23]
java: [21, 24]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
Expand Down
47 changes: 37 additions & 10 deletions .github/workflows/backwards_compatibility_tests_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,42 @@ on:
- "feature/**"

jobs:
Get-CI-Image-Tag:
uses: opensearch-project/opensearch-build/.github/workflows/get-ci-image-tag.yml@main
with:
product: opensearch

Restart-Upgrade-BWCTests-NeuralSearch:
needs: Get-CI-Image-Tag
strategy:
matrix:
java: [ 21, 23 ]
java: [ 21, 24 ]
os: [ubuntu-latest]
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","2.17.0","2.18.0","2.19.0","2.20.0-SNAPSHOT","3.0.0" ]
opensearch_version : [ "3.1.0-SNAPSHOT" ]
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","2.17.0","2.18.0","2.19.0","2.20.0-SNAPSHOT","3.0.0", "3.1.0" ]
opensearch_version : [ "3.2.0-SNAPSHOT" ]

name: NeuralSearch Restart-Upgrade BWC Tests
runs-on: ${{ matrix.os }}
container:
# using the same image which is used by opensearch-build team to build the OpenSearch Distribution
# this image tag is subject to change as more dependencies and updates will arrive over time
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
# need to switch to root so that github actions can install runner binary on container without permission issues.
options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}
env:
BWC_VERSION_RESTART_UPGRADE: ${{ matrix.bwc_version }}

steps:
- name: Run start commands
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}

- name: Checkout neural-search
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Setup Java ${{ matrix.java }}
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}

- name: Run NeuralSearch Restart-Upgrade BWC Tests from BWCVersion-${{ matrix.bwc_version }} to OpenSearch Version-${{ matrix.opensearch_version }} on ${{matrix.os}}
Expand All @@ -38,25 +54,36 @@ jobs:
./gradlew :qa:restart-upgrade:testAgainstNewCluster -D'tests.bwc.version=${{ matrix.bwc_version }}'

Rolling-Upgrade-BWCTests-NeuralSearch:
needs: Get-CI-Image-Tag
strategy:
matrix:
java: [21, 23]
java: [21, 24]
os: [ubuntu-latest]
bwc_version: [ "2.20.0-SNAPSHOT","3.0.0" ]
opensearch_version: [ "3.1.0-SNAPSHOT" ]
bwc_version: [ "2.20.0-SNAPSHOT","3.0.0", "3.1.0" ]
opensearch_version: [ "3.2.0-SNAPSHOT" ]

name: NeuralSearch Rolling-Upgrade BWC Tests
runs-on: ${{ matrix.os }}
container:
# using the same image which is used by opensearch-build team to build the OpenSearch Distribution
# this image tag is subject to change as more dependencies and updates will arrive over time
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
# need to switch to root so that github actions can install runner binary on container without permission issues.
options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}
env:
BWC_VERSION_ROLLING_UPGRADE: ${{ matrix.bwc_version }}

steps:
- name: Run start commands
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}

- name: Checkout neural-search
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Setup Java ${{ matrix.java }}
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}

- name: Run NeuralSearch Rolling-Upgrade BWC Tests from BWCVersion-${{ matrix.bwc_version }} to OpenSearch Version-${{ matrix.opensearch_version }} on ${{matrix.os}}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_aggregations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
needs: Get-CI-Image-Tag
strategy:
matrix:
java: [21, 23]
java: [21, 24]
os: [ubuntu-latest]

name: Integ Tests Linux
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
Check-neural-search-windows:
strategy:
matrix:
java: [23]
java: [24]
os: [windows-latest]

name: Integ Tests Windows
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
integ-test-with-security-linux:
strategy:
matrix:
java: [21, 23]
java: [21, 24]

name: Run Integration Tests on Linux
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ buildscript {
dependencies {
classpath "${opensearch_group}.gradle:build-tools:${opensearch_version}"
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
classpath "io.freefair.gradle:lombok-plugin:8.4"
classpath "io.freefair.gradle:lombok-plugin:8.14"

configurations.all {
resolutionStrategy {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
# https://github.com/opensearch-project/OpenSearch/blob/main/libs/core/src/main/java/org/opensearch/Version.java .
# Wired compatibility of OpenSearch works like 3.x version is compatible with 2.(latest-major) version.
# Therefore, to run rolling-upgrade BWC Test on local machine the BWC version here should be set 2.(latest-major).
systemProp.bwc.version=3.1.0-SNAPSHOT
systemProp.bwc.bundle.version=3.0.0
systemProp.bwc.version=3.2.0-SNAPSHOT
systemProp.bwc.bundle.version=3.1.0

# For fixing Spotless check with Java 17
org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
distributionSha256Sum=efe9a3d147d948d7528a9887fa35abcf24ca1a43ad06439996490f77569b02d1
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion src/main/plugin-metadata/plugin-security.policy
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ grant {
permission java.lang.RuntimePermission "accessDeclaredMembers";
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
permission java.lang.RuntimePermission "setContextClassLoader";

permission java.io.FilePermission "/sys/fs/cgroup/system.slice/hosted-compute-agent.service/memory.max", "read";
};
Loading