Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignores test failures only in TeamCity #2743

Merged
merged 1 commit into from
Apr 14, 2022
Merged
Changes from all 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
11 changes: 9 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ allprojects {
}

apply plugin: 'java-library'
if (System.getenv("CI") == "true")
if (System.env.CI != null)
apply from: 'teamcity-repository.gradle'

repositories {
Expand Down Expand Up @@ -79,11 +79,18 @@ subprojects {
forkEvery = 50
maxParallelForks = 1 //Runtime.runtime.availableProcessors().intdiv(2) + 1

// This would apply only to GitHub Actions
if (System.env.CI != null) {
minHeapSize = "128m"
maxHeapSize = "512m"
}

// This would apply only to TeamCity
// We need to ignore the failures because we may have tests muted
if (System.env.TEAMCITY_VERSION != null) {
ignoreFailures(true)
}

jvmArgs = [ "--add-opens", "java.base/java.lang=ALL-UNNAMED",
"--add-opens", "java.base/java.nio=ALL-UNNAMED",
"--add-opens", "java.base/java.io=ALL-UNNAMED",
Expand Down Expand Up @@ -126,7 +133,7 @@ ext {
// NB: due to version.json generation by parsing this file, the next line must not have any if/then/else logic
neo4jVersion = "5.0.0"
// This should be removed when the version is stable and released
neo4jInDevVersion = (System.getenv("CI") == "true") ? neo4jVersion + "-dev" : neo4jVersion + "-SNAPSHOT"
neo4jInDevVersion = (System.env.CI != null) ? neo4jVersion + "-dev" : neo4jVersion + "-SNAPSHOT"
// instead we apply the override logic here
neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : neo4jInDevVersion
testContainersVersion = '1.16.2'
Expand Down