[TEAMCITY-QA-T] Fix redundant Linux OS type requirements (#83)

* Remove redundant platform requirements. * Update parameters related to Docker platform.
JetBrains · Jun 28, 2023 · ccc24ad · ccc24ad
1 parent 6894c40
commit ccc24ad
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/.teamcity/delivery/BuildAndPushHosted.kts b/.teamcity/delivery/BuildAndPushHosted.kts
@@ -13,7 +13,7 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.dockerCommand
  * TODO: Remove configuration, as it duplicates the build included into PushLocalLinux2004.kts, while seems redundant.
  */
 object BuildAndPushHosted : BuildType({
-    name = "Build and push for teamcity.jetbrains.com"
+    name = "[Linux] [Staging] Build And Push 'teamcity-server' Docker image into staging registry"
     buildNumberPattern = "%dockerImage.teamcity.buildNumber%-%build.counter%"
     vcs { root(TeamCityDockerImagesRepo) }
 

diff --git a/.teamcity/delivery/production/PushHubLinux.kts b/.teamcity/delivery/production/PushHubLinux.kts
@@ -11,6 +11,10 @@ object push_hub_linux : BuildType({
     description = "Moves TeamCity Linux-based staging images into production registry."
     buildNumberPattern = "%dockerImage.teamcity.buildNumber%-%build.counter%"
 
+    params {
+        param("dockerImage.platform", "linux")
+    }
+
     steps {
         ImageInfoRepository.getAmdLinuxImages2004().forEach { imageInfo ->
             moveToProduction(imageInfo)

diff --git a/.teamcity/delivery/staging/PushLocalLinux2004.kts b/.teamcity/delivery/staging/PushLocalLinux2004.kts
@@ -17,6 +17,10 @@ object push_local_linux_20_04 : BuildType({
         root(TeamCityDockerImagesRepo)
     }
 
+    params {
+        param("dockerImage.platform", "linux")
+    }
+
     steps {
         dockerCommand {
             name = "Preflight check of base image - ubuntu:20.04"
@@ -40,6 +44,7 @@ object push_local_linux_20_04 : BuildType({
     }
 
     requirements {
+        contains("docker.server.osType", "linux")
         // In order to correctly build AMD-based images, we wouldn't want it to be scheduled on ARM-based agent
         doesNotContain("teamcity.agent.name", "arm")
     }

diff --git a/.teamcity/utils/dsl/steps/DockerSteps.kt b/.teamcity/utils/dsl/steps/DockerSteps.kt
@@ -33,7 +33,6 @@ fun BuildSteps.buildImage(imageInfo: ImageInfo) {
             commandArgs = "--no-cache"
             namesAndTags = imageInfo.baseFqdn.trimIndent()
         }
-        param("dockerImage.platform", "linux")
     }
 
     this.dockerCommand {