Skip to content

Commit

Permalink
Increasing test heap size and incrementing guava version
Browse files Browse the repository at this point in the history
Signed-off-by: Bharathwaj G <[email protected]>
  • Loading branch information
bharath-techie committed Sep 5, 2023
1 parent 62b1c27 commit 41b8690
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Checkout Branch
uses: actions/checkout@v2
- name: Build with Gradle
run: ./gradlew build
run: ./gradlew build -Dtests.heap.size=1G
- name: Pull and Run Docker for security tests
run: |
version=`./gradlew properties -q | grep "opensearch_version:" | awk '{print $2}'`
Expand Down Expand Up @@ -74,10 +74,10 @@ jobs:
if [ $security -gt 0 ]
then
echo "Security plugin is available"
./gradlew integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="docker-cluster" -Dhttps=true -Duser=admin -Dpassword=admin
./gradlew integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="docker-cluster" -Dhttps=true -Duser=admin -Dpassword=admin -Dtests.heap.size=1G
else
echo "Security plugin is NOT available"
./gradlew integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="docker-cluster"
./gradlew integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="docker-cluster" -Dtests.heap.size=1G
fi
- name: Upload failed logs
uses: actions/upload-artifact@v2
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/multi-node-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ jobs:
with:
java-version: ${{ env.java_version }}
# This step uses the checkout Github action: https://github.com/actions/checkout
# Custom setting - heap size = 1G ( 512MB is default )
- name: Checkout Branch
uses: actions/checkout@v2
- name: Run integration tests with multi node config
run: ./gradlew integTest -PnumNodes=5
run: ./gradlew integTest -PnumNodes=5 -Dtests.heap.size=1G
- name: Run Backwards Compatibility Tests
run: |
echo "Running backwards compatibility tests ..."
./gradlew bwcTestSuite -Dtests.security.manager=false
./gradlew bwcTestSuite -Dtests.security.manager=false -Dtests.heap.size=1G
- name: Upload failed logs
uses: actions/upload-artifact@v2
if: failure()
Expand Down
6 changes: 5 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ apply plugin: 'opensearch.pluginzip'


checkstyle {
toolVersion = '8.29'
toolVersion = '10.12.1'
configFile file("checkstyle/checkstyle.xml")
}

Expand Down Expand Up @@ -134,6 +134,7 @@ dependencies {
implementation "org.opensearch:common-utils:${common_utils_version}"
configurations.all {
resolutionStrategy {
force "com.google.guava:guava:32.0.1-jre"
force "com.puppycrawl.tools:checkstyle:${project.checkstyle.toolVersion}"
}
}
Expand Down Expand Up @@ -170,6 +171,7 @@ def securityEnabled = System.getProperty("security", "false") == "true"
test {
systemProperty 'tests.security.manager', 'false'
systemProperty 'es.set.netty.runtime.available.processors', 'false'
systemProperty 'tests.heap.size', '1G'

}

Expand All @@ -196,6 +198,7 @@ testClusters.integTest {

integTest {
systemProperty 'tests.security.manager', 'false'
systemProperty 'tests.heap.size', '1G'
systemProperty 'java.io.tmpdir', opensearch_tmp_dir.absolutePath
systemProperty 'buildDir', buildDir.path
systemProperty "https", System.getProperty("https", securityEnabled.toString())
Expand Down Expand Up @@ -229,6 +232,7 @@ task integTestRemote(type: RestIntegTestTask) {
testClassesDirs = sourceSets.test.output.classesDirs
classpath = sourceSets.test.runtimeClasspath
systemProperty 'tests.security.manager', 'false'
systemProperty 'tests.heap.size', '1G'
systemProperty 'java.io.tmpdir', opensearch_tmp_dir.absolutePath

systemProperty "https", System.getProperty("https")
Expand Down

0 comments on commit 41b8690

Please sign in to comment.