ci: minor tweaks for the compat build pipelines (#334)

ali-ince · web-flow · commit 1a9f9a04995b · 2025-04-16T09:28:30.000+01:00
diff --git a/.teamcity/builds/Build.kt b/.teamcity/builds/Build.kt
@@ -21,6 +21,7 @@ val DEFAULT_NEO4J_VERSION = Neo4jVersion.V_2025
 class Build(
     name: String,
     forPullRequests: Boolean,
+    forCompatibility: Boolean = false,
     neo4jVersion: Neo4jVersion = DEFAULT_NEO4J_VERSION,
     customizeCompletion: BuildType.() -> Unit = {}
 ) :
@@ -44,7 +45,7 @@ class Build(
                         "package (${java.javaVersion.version})",
                         "package",
                         java.javaVersion,
-                        neo4jVersion,
+                        Neo4jVersion.V_NONE,
                         "-pl :packaging -am -DskipTests",
                     )
 
@@ -55,7 +56,7 @@ class Build(
                           "build (${java.javaVersion.version})",
                           "test-compile",
                           java.javaVersion,
-                          neo4jVersion,
+                          Neo4jVersion.V_NONE,
                       ),
                   )
                   dependentBuildType(
@@ -98,7 +99,7 @@ class Build(
             }
 
             dependentBuildType(complete)
-            if (!forPullRequests)
+            if (!forPullRequests && !forCompatibility)
                 dependentBuildType(Release("${name}-release", "release", DEFAULT_JAVA_VERSION))
           }
 
@@ -108,7 +109,7 @@ class Build(
             it.features {
               loginToECR()
               requireDiskSpace("5gb")
-              enableCommitStatusPublisher()
+              if (!forCompatibility) enableCommitStatusPublisher()
               if (forPullRequests) enablePullRequests()
             }
 
diff --git a/.teamcity/builds/Common.kt b/.teamcity/builds/Common.kt
@@ -11,7 +11,9 @@ import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher
 import jetbrains.buildServer.configs.kotlin.buildFeatures.dockerRegistryConnections
 import jetbrains.buildServer.configs.kotlin.buildFeatures.freeDiskSpace
 import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests
+import jetbrains.buildServer.configs.kotlin.buildSteps.DockerCommandStep
 import jetbrains.buildServer.configs.kotlin.buildSteps.MavenBuildStep
+import jetbrains.buildServer.configs.kotlin.buildSteps.dockerCommand
 import jetbrains.buildServer.configs.kotlin.buildSteps.maven
 import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot
 
@@ -41,6 +43,7 @@ enum class JavaVersion(val version: String, val dockerImage: String) {
 }
 
 enum class Neo4jVersion(val version: String, val dockerImage: String) {
+  V_NONE("", ""),
   V_4_4("4.4", "neo4j:4.4-enterprise"),
   V_4_4_DEV(
       "4.4-dev",
@@ -140,3 +143,12 @@ fun BuildSteps.commonMaven(
   init(maven)
   return maven
 }
+
+fun BuildSteps.pullImage(version: Neo4jVersion): DockerCommandStep =
+    this.dockerCommand {
+      name = "pull neo4j test image"
+      commandType = other {
+        subCommand = "image"
+        commandArgs = "pull ${version.dockerImage}"
+      }
+    }
diff --git a/.teamcity/builds/IntegrationTests.kt b/.teamcity/builds/IntegrationTests.kt
@@ -44,6 +44,10 @@ class IntegrationTests(
           }
 
           steps {
+            if (neo4jVersion != Neo4jVersion.V_NONE) {
+              pullImage(neo4jVersion)
+            }
+
             script {
               scriptContent =
                   """
diff --git a/.teamcity/builds/Maven.kt b/.teamcity/builds/Maven.kt
@@ -9,7 +9,7 @@ class Maven(
     name: String,
     goals: String,
     javaVersion: JavaVersion,
-    neo4jVersion: Neo4jVersion = DEFAULT_NEO4J_VERSION,
+    neo4jVersion: Neo4jVersion,
     args: String? = null
 ) :
     BuildType({
@@ -22,6 +22,10 @@ class Maven(
       }
 
       steps {
+        if (neo4jVersion != Neo4jVersion.V_NONE) {
+          pullImage(neo4jVersion)
+        }
+
         commonMaven(javaVersion) {
           this.goals = goals
           this.runnerArgs =
diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts
@@ -45,38 +45,44 @@ project {
         this.id("compatibility")
         name = "compatibility"
 
-        Neo4jVersion.entries.forEach { neo4j ->
+        Neo4jVersion.entries.minus(Neo4jVersion.V_NONE).forEach { neo4j ->
           subProject(
-              Build(name = "${neo4j.version}", forPullRequests = false, neo4jVersion = neo4j) {
-                triggers {
-                  vcs { enabled = false }
+              Build(
+                  name = "${neo4j.version}",
+                  forPullRequests = false,
+                  forCompatibility = true,
+                  neo4jVersion = neo4j) {
+                    triggers {
+                      vcs { enabled = false }
 
-                  schedule {
-                    branchFilter = "+:main"
-                    schedulingPolicy = daily {
-                      hour = 8
-                      minute = 0
+                      schedule {
+                        branchFilter = "+:main"
+                        schedulingPolicy = daily {
+                          hour = 8
+                          minute = 0
+                        }
+                        triggerBuild = always()
+                      }
                     }
-                    triggerBuild = always()
-                  }
-                }
 
-                features {
-                  notifications {
-                    buildFailedToStart = true
-                    buildFailed = true
-                    firstFailureAfterSuccess = true
-                    firstSuccessAfterFailure = true
-                    buildProbablyHanging = true
+                    features {
+                      notifications {
+                        buildFailedToStart = true
+                        buildFailed = true
+                        firstFailureAfterSuccess = true
+                        firstSuccessAfterFailure = true
+                        buildProbablyHanging = true
 
-                    notifierSettings = slackNotifier {
-                      connection = SLACK_CONNECTION_ID
-                      sendTo = SLACK_CHANNEL
-                      messageFormat = simpleMessageFormat()
+                        branchFilter = "+:main"
+
+                        notifierSettings = slackNotifier {
+                          connection = SLACK_CONNECTION_ID
+                          sendTo = SLACK_CHANNEL
+                          messageFormat = simpleMessageFormat()
+                        }
+                      }
                     }
-                  }
-                }
-              })
+                  })
         }
       })
 }
diff --git a/common/pom.xml b/common/pom.xml
@@ -84,6 +84,11 @@
             <artifactId>mockito-kotlin</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
diff --git a/common/src/test/kotlin/org/neo4j/connectors/kafka/data/TypesTest.kt b/common/src/test/kotlin/org/neo4j/connectors/kafka/data/TypesTest.kt
@@ -75,6 +75,7 @@ class TypesTest {
     val neo4j: Neo4jContainer<*> =
         Neo4jContainer(neo4jImage())
             .withEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT", "yes")
+            .withExposedPorts(7687)
             .withoutAuthentication()
 
     private lateinit var driver: Driver
diff --git a/source/src/test/kotlin/org/neo4j/connectors/kafka/source/Neo4jCdcTaskTest.kt b/source/src/test/kotlin/org/neo4j/connectors/kafka/source/Neo4jCdcTaskTest.kt
@@ -63,6 +63,7 @@ class Neo4jCdcTaskTest {
     val container: Neo4jContainer<*> =
         Neo4jContainer(neo4jImage())
             .withEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT", "yes")
+            .withExposedPorts(7687)
             .withoutAuthentication()
 
     private lateinit var driver: Driver
@@ -88,8 +89,8 @@ class Neo4jCdcTaskTest {
 
   @AfterEach
   fun after() {
-    session.close()
-    task.stop()
+    if (this::session.isInitialized) session.close()
+    if (this::task.isInitialized) task.stop()
   }
 
   @BeforeEach
diff --git a/source/src/test/kotlin/org/neo4j/connectors/kafka/source/Neo4jQueryTaskTest.kt b/source/src/test/kotlin/org/neo4j/connectors/kafka/source/Neo4jQueryTaskTest.kt
@@ -60,6 +60,7 @@ class Neo4jQueryTaskTest {
     val neo4j: Neo4jContainer<*> =
         Neo4jContainer(neo4jImage())
             .withEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT", "yes")
+            .withExposedPorts(7687)
             .withoutAuthentication()
 
     private lateinit var driver: Driver
diff --git a/testing/src/main/kotlin/org/neo4j/connectors/kafka/testing/DatabaseSupport.kt b/testing/src/main/kotlin/org/neo4j/connectors/kafka/testing/DatabaseSupport.kt
@@ -26,9 +26,13 @@ object DatabaseSupport {
     if (database == DEFAULT_DATABASE) {
       return this
     }
-    this.run(
-        "CREATE DATABASE \$db_name OPTIONS { txLogEnrichment: '${if (withCdc) { "FULL" } else "OFF"}' } WAIT 30 SECONDS",
-        mapOf("db_name" to database))
+    if (withCdc) {
+      this.run(
+          "CREATE DATABASE \$db_name OPTIONS { txLogEnrichment: 'FULL' } WAIT 30 SECONDS",
+          mapOf("db_name" to database))
+    } else {
+      this.run("CREATE DATABASE \$db_name WAIT 30 SECONDS", mapOf("db_name" to database))
+    }
     return this
   }
 
