Skip to content

Commit

Permalink
Attempt to fix TeamCity build:
Browse files Browse the repository at this point in the history
- Bump neo4j image to 4.3 so that it uses the latest
- Increase memory for the container
  • Loading branch information
AzuObs committed Apr 22, 2022
1 parent 7aca8b6 commit 1c70a9a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ subprojects {
// neo4jDockerImage system property is used in TestContainerUtil
systemProperties 'user.language' : 'en' ,
'user.country ' : 'US',
'neo4jDockerImage' : System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") + '-enterprise' : 'neo4j:4.3.3-enterprise',
'neo4jCommunityDockerImage': System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") : 'neo4j:4.3.3'
'neo4jDockerImage' : System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") + '-enterprise' : 'neo4j:4.3-enterprise',
'neo4jCommunityDockerImage': System.getProperty("NEO4JVERSION") ? 'neo4j:' + System.getProperty("NEO4JVERSION") : 'neo4j:4.3'

maxHeapSize = "8G"
forkEvery = 50
Expand Down Expand Up @@ -121,7 +121,7 @@ subprojects {

ext {
// NB: due to version.json generation by parsing this file, the next line must not have any if/then/else logic
neo4jVersion = "4.3.8"
neo4jVersion = "4.3.12"
// instead we apply the override logic here
neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : neo4jVersion
testContainersVersion = '1.15.1'
Expand Down
4 changes: 2 additions & 2 deletions test-utils/src/main/java/apoc/util/TestContainerUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static Neo4jContainerExtension createEnterpriseDB(File baseDir, boolean w
importFolder.mkdirs();

// read neo4j version from build.gradle and use this as default
String neo4jDockerImageVersion = System.getProperty("neo4jDockerImage", "neo4j:4.3.3-enterprise");
String neo4jDockerImageVersion = System.getProperty("neo4jDockerImage", "neo4j:4.3-enterprise");

// use a separate folder for mounting plugins jar - build/libs might contain other jars as well.
File pluginsFolder = new File(baseDir, "build/plugins");
Expand Down Expand Up @@ -81,7 +81,7 @@ public static Neo4jContainerExtension createEnterpriseDB(File baseDir, boolean w
.withFileSystemBind(canonicalPath, "/var/lib/neo4j/import") // map the "target/import" dir as the Neo4j's import dir
.withEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT", "yes")
// .withDebugger() // uncomment this line for remote debbuging inside docker's neo4j instance
.withCreateContainerCmdModifier(cmd -> cmd.withMemory(1024 * 1024 * 1024l))
.withCreateContainerCmdModifier(cmd -> cmd.withMemory(2024 * 1024 * 1024l))

// set uid if possible - export tests do write to "/import"
.withCreateContainerCmdModifier(cmd -> {
Expand Down

0 comments on commit 1c70a9a

Please sign in to comment.