Team city config (#341)

Deltares · Oct 21, 2024 · a0c23f7 · a0c23f7
1 parent 135282e
commit a0c23f7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/.teamcity/IMODCollector/buildTypes/IMODCollector_X64Release.kt b/.teamcity/IMODCollector/buildTypes/IMODCollector_X64Release.kt
@@ -16,7 +16,7 @@ object IMODCollector_X64Release : BuildType({
         coupler/dist/ => imod_collector.zip!/
         modflow6/ => imod_collector.zip!/modflow6/
         metaswap/ => imod_collector.zip!/metaswap/
-        ribasim/ribasim/ => imod_collector.zip!/ribasim/
+        ribasim/ => imod_collector.zip!/ribasim/
     """.trimIndent()
 
     params {

diff --git a/.teamcity/_Self/buildTypes/TestbenchCouplerWin64Release.kt b/.teamcity/_Self/buildTypes/TestbenchCouplerWin64Release.kt
@@ -1,6 +1,6 @@
 package _Self.buildTypes
 
-import IMODCollector.buildTypes.IMODCollector_X64development
+import IMODCollector.buildTypes.IMODCollector_X64Release
 import _Self.vcsRoots.ImodCoupler
 import jetbrains.buildServer.configs.kotlin.*
 import jetbrains.buildServer.configs.kotlin.buildFeatures.XmlReport
@@ -18,20 +18,20 @@ object TestbenchCouplerWin64Release : BuildType({
     publishArtifacts = PublishMode.ALWAYS
 
     params {
-        param("env.METASWAP_DLL_REGRESSION", "%system.teamcity.build.checkoutDir%/imod_collector_regression/metaswap/MetaSWAP.dll")
-        param("env.IMOD_COUPLER_EXEC_REGRESSION", "%system.teamcity.build.checkoutDir%/imod_collector_regression/imod_coupler/imodc.exe")
+        param("env.METASWAP_DLL_REGRESSION", "%system.teamcity.build.checkoutDir%/imod_collector_devel/metaswap/MetaSWAP.dll")
+        param("env.IMOD_COUPLER_EXEC_REGRESSION", "%system.teamcity.build.checkoutDir%/imod_collector_devel/imodc.exe")
         param("env.MODFLOW_DLL_DEVEL", "%system.teamcity.build.checkoutDir%/imod_collector_devel/modflow6/libmf6.dll")
-        param("env.MODFLOW_DLL_REGRESSION", "%system.teamcity.build.checkoutDir%/imod_collector_regression/modflow6/libmf6.dll")
+        param("env.MODFLOW_DLL_REGRESSION", "%system.teamcity.build.checkoutDir%/imod_collector_devel/modflow6/libmf6.dll")
         param("env.RIBASIM_DLL_DEP_DIR_DEVEL", "%system.teamcity.build.checkoutDir%/imod_collector_devel/ribasim/bin")
         param("env.RIBASIM_DLL_DEVEL", "%system.teamcity.build.checkoutDir%/imod_collector_devel/ribasim/bin/libribasim.dll")
         param("conda_env_path", "%system.teamcity.build.checkoutDir%/imod_coupler_testbench_env")
-        param("env.METASWAP_DLL_DEP_DIR_REGRESSION", "%system.teamcity.build.checkoutDir%/imod_collector_regression/metaswap")
+        param("env.METASWAP_DLL_DEP_DIR_REGRESSION", "%system.teamcity.build.checkoutDir%/imod_collector_devel/metaswap")
         param("env.METASWAP_DLL_DEVEL", "%system.teamcity.build.checkoutDir%/imod_collector_devel/metaswap/MetaSWAP.dll")
         param("env.METASWAP_DLL_DEP_DIR_DEVEL", "%system.teamcity.build.checkoutDir%/imod_collector_devel/metaswap")
         param("env.IMOD_COUPLER_EXEC_DEVEL", "%system.teamcity.build.checkoutDir%/imod_collector_devel/imodc.exe")
-        param("env.RIBASIM_DLL_DEP_DIR_REGRESSION", "%system.teamcity.build.checkoutDir%/imod_collector_regression/ribasim/bin")
+        param("env.RIBASIM_DLL_DEP_DIR_REGRESSION", "%system.teamcity.build.checkoutDir%/imod_collector_devel/ribasim/bin")
         param("env.METASWAP_LOOKUP_TABLE", "%system.teamcity.build.checkoutDir%/lookup_table")
-        param("env.RIBASIM_DLL_REGRESSION", "%system.teamcity.build.checkoutDir%/imod_collector_regression/ribasim/bin/libribasim.dll")
+        param("env.RIBASIM_DLL_REGRESSION", "%system.teamcity.build.checkoutDir%/imod_collector_devel/ribasim/bin/libribasim.dll")
     }
 
     vcs {
@@ -66,7 +66,7 @@ object TestbenchCouplerWin64Release : BuildType({
 
     triggers {
         finishBuildTrigger {
-            buildType = "${IMODCollector_X64development.id}"
+            buildType = "${IMODCollector_X64Release.id}"
             successfulOnly = true
         }
         vcs {
@@ -92,6 +92,10 @@ object TestbenchCouplerWin64Release : BuildType({
         }
     }
 
+    failureConditions {
+        executionTimeoutMin = 120
+    }
+
     dependencies {
         dependency(IMODCollector.buildTypes.IMODCollector_X64Release) {
             snapshot {
@@ -105,11 +109,6 @@ object TestbenchCouplerWin64Release : BuildType({
                 """.trimIndent()
             }
         }
-        artifacts(AbsoluteId("iMOD6_Coupler_IMODCollector_X64development")){
-            buildRule = tag("regression")
-            cleanDestination = true
-            artifactRules = "imod_coupler_windows.zip!** => imod_collector_regression"
-        }
     }
 
     requirements {