[maintenance] CI maintenance

JetBrains · Oct 5, 2024 · 1aeb672 · 1aeb672
1 parent c996c28
commit 1aeb672
Show file tree

Hide file tree

Showing 5 changed files with 10,960 additions and 10,613 deletions.
diff --git a/.teamcity/configurations/baseConfiguration.kts b/.teamcity/configurations/baseConfiguration.kts
@@ -18,6 +18,7 @@ open class BaseBuildType(
   failureConditions: FailureConditions.() -> Unit = {},
   requirements: (Requirements.() -> Unit)? = null,
   params: ParametrizedWithType.() -> Unit = {},
+  dockerSupport: DockerSupportFeature.() -> Unit = {},
 ) : BuildType({
 
     this.name = name
@@ -51,6 +52,8 @@ open class BaseBuildType(
       }
     }
 
+    this.features.dockerSupport(dockerSupport)
+
     features {
       perfmon {
       }

diff --git a/.teamcity/configurations/pluginBenchmark.kts b/.teamcity/configurations/pluginBenchmark.kts
@@ -13,14 +13,24 @@ open class Benchmark(vcsRoot: GitVcsRoot, requirements: (Requirements.() -> Unit
     requirements = requirements,
     artifactRules = Utils.CommonParams.BazelTestlogsArtifactRules,
     steps = {
-      val sysArgs = "--jvmopt=\"-Dbsp.benchmark.project.path=/home/hirschuser/project_10\" --jvmopt=\"-Dbsp.benchmark.teamcity.url=https://bazel.teamcity.com\""
       bazel {
+        val url = "--jvmopt=\"-Dbsp.benchmark.teamcity.url=https://bazel.teamcity.com\""
+        val projectNameArg = "--jvmopt=\"-Dbsp.benchmark.project.name=benchmark_10_targets\""
+        val reportErrors = "--jvmopt=\"-DDO_NOT_REPORT_ERRORS=true\""
+        val projectPath =
+          "--jvmopt=\"-Dbsp.benchmark.project.path=/home/hirschuser/project_10\""
+        val cachePath = "--jvmopt=\"-Dbsp.benchmark.cache.directory=%system.teamcity.build.tempDir%\""
+        val memArg = "--jvmopt=\"-Xmx12g\""
+        val sandboxArg = "--sandbox_writable_path=/"
+        val actionEnvArg = "--action_env=PATH"
+
+        val sysArgs = "$url $projectNameArg $reportErrors $projectPath $cachePath $memArg $sandboxArg $actionEnvArg"
+
         name = "run benchmark"
         id = "run_benchmark"
         command = "test"
         targets = "//plugin-bsp/performance-testing"
-        arguments =
-          "--jvmopt=\"-Xmx12g\" $sysArgs --sandbox_writable_path=/ --action_env=PATH ${Utils.CommonParams.BazelCiSpecificArgs}"
+        arguments = "$sysArgs ${Utils.CommonParams.BazelCiSpecificArgs}"
         toolPath = "/usr/local/bin"
         logging = BazelStep.Verbosity.Diagnostic
         Utils.DockerParams.get().forEach { (key, value) ->

diff --git a/.teamcity/configurations/staticAnalysis.kts b/.teamcity/configurations/staticAnalysis.kts
@@ -7,6 +7,7 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.bazel
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.qodana
 import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
 
+
 open class Analyze(vcsRoot: GitVcsRoot) :
     BaseConfiguration.BaseBuildType(
         name = "[analysis] Qodana",
@@ -41,7 +42,7 @@ open class Analyze(vcsRoot: GitVcsRoot) :
             qodana {
                 name = "run qodana"
                 id = "run_qodana"
-                reportAsTests = true
+                reportAsTests = false
                 linter = customLinter {
                     image = Utils.CommonParams.DockerQodanaImage
                 }
@@ -64,8 +65,14 @@ open class Analyze(vcsRoot: GitVcsRoot) :
         vcsRoot = vcsRoot,
         params = {
             password("qodana.cloud.token", "credentialsJSON:d57ead0e-b567-440d-817e-f92e084a1cc0", label = "qodana.cloud.token", description = "Qodana token for Hirschgarten statistics", display = ParameterDisplay.HIDDEN)
-        }
-)
+        },
+        dockerSupport = {
+            loginToRegistry = on {
+            dockerRegistryId = "PROJECT_EXT_3"
+            }
+        },
+        failureConditions = { executionTimeoutMin = 30 }
+    )
 
 object GitHub : Analyze(
     vcsRoot = BaseConfiguration.GitHubVcs,

diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts
@@ -1,5 +1,4 @@
 import configurations.*
-import jetbrains.buildServer.configs.kotlin.v10.buildSteps.Qodana
 import jetbrains.buildServer.configs.kotlin.v10.toExtId
 import jetbrains.buildServer.configs.kotlin.v2019_2.*
 import jetbrains.buildServer.configs.kotlin.v2019_2.Project