Allow adhoc snapshot releases

eclipse · Dec 9, 2020 · 99d012b · 99d012b
1 parent be31ac8
commit 99d012b
Show file tree

Hide file tree

Showing 8 changed files with 319 additions and 19 deletions.
diff --git a/.teamcity/Buildship/Promotion30/Project.kt b/.teamcity/Buildship/Promotion30/Project.kt
@@ -3,19 +3,21 @@ package Buildship.Promotion30
 import Buildship.Promotion30.buildTypes.Milestone
 import Buildship.Promotion30.buildTypes.Release
 import Buildship.Promotion30.buildTypes.Snapshot
-import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay
+import Buildship.Promotion30.buildTypes.SnapshotAdHoc
 import jetbrains.buildServer.configs.kotlin.v2019_2.Project
 
 object Project : Project({
     id("Promotion")
     name = "Promotion"
     description = "Promotes Buildship releases"
 
+    template(PromotionDependencyTemplate)
     template(Promotion30Template)
 
+    buildType(SnapshotAdHoc)
     buildType(Snapshot)
     buildType(Release)
     buildType(Milestone)
 
-    buildTypesOrder = arrayListOf(Release, Milestone, Snapshot)
+    buildTypesOrder = arrayListOf(Release, Milestone, Snapshot, SnapshotAdHoc)
 })
diff --git a/.teamcity/Buildship/Promotion30/Promotion30Template.kt b/.teamcity/Buildship/Promotion30/Promotion30Template.kt
@@ -1,10 +1,8 @@
 package Buildship.Promotion30
 
-import Buildship.Check30.Checkpoints.buildTypes.Final
 import Buildship.GitHubVcsRoot
 import Buildship.addCredentialsLeakFailureCondition
 import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
-import jetbrains.buildServer.configs.kotlin.v2019_2.FailureAction
 import jetbrains.buildServer.configs.kotlin.v2019_2.Template
 
 object Promotion30Template : Template({
@@ -33,12 +31,4 @@ object Promotion30Template : Template({
     failureConditions {
         errorMessage = true
     }
-
-    dependencies {
-        snapshot(Final) {
-            onDependencyFailure = FailureAction.FAIL_TO_START
-            onDependencyCancel = FailureAction.CANCEL
-        }
-        snapshot(Buildship.Check30.CrossVersionCoverage.buildTypes.Eclipse47Java9, Buildship.Check30.Checkpoints.buildTypes.CheckpointUtils.DefaultFailureCondition)
-    }
 })
diff --git a/.teamcity/Buildship/Promotion30/PromotionDependencyTemplate.kt b/.teamcity/Buildship/Promotion30/PromotionDependencyTemplate.kt
@@ -0,0 +1,17 @@
+package Buildship.Promotion30
+
+import Buildship.Check30.Checkpoints.buildTypes.Final
+import jetbrains.buildServer.configs.kotlin.v2019_2.FailureAction
+import jetbrains.buildServer.configs.kotlin.v2019_2.Template
+
+object PromotionDependencyTemplate : Template({
+    name = "Promotion Dependency Template"
+
+    dependencies {
+        snapshot(Final) {
+            onDependencyFailure = FailureAction.FAIL_TO_START
+            onDependencyCancel = FailureAction.CANCEL
+        }
+        snapshot(Buildship.Check30.CrossVersionCoverage.buildTypes.Eclipse47Java9, Buildship.Check30.Checkpoints.buildTypes.CheckpointUtils.DefaultFailureCondition)
+    }
+})
diff --git a/.teamcity/Buildship/Promotion30/buildTypes/Milestone.kt b/.teamcity/Buildship/Promotion30/buildTypes/Milestone.kt
@@ -1,6 +1,7 @@
 package Buildship.Promotion30.buildTypes
 
 import Buildship.Promotion30.Promotion30Template
+import Buildship.Promotion30.PromotionDependencyTemplate
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
@@ -9,7 +10,7 @@ object Milestone : BuildType({
     id("Promote30_Milestone")
     name = "Promote Milestone"
 
-    templates(Promotion30Template)
+    templates(Promotion30Template, PromotionDependencyTemplate)
 
     params {
         text("Confirm", "NO", label = "Do you want to proceed with the milestone?", description = "Confirm to publish a new milestone.", display = ParameterDisplay.PROMPT,

diff --git a/.teamcity/Buildship/Promotion30/buildTypes/Release.kt b/.teamcity/Buildship/Promotion30/buildTypes/Release.kt
@@ -1,6 +1,7 @@
 package Buildship.Promotion30.buildTypes
 
 import Buildship.Promotion30.Promotion30Template
+import Buildship.Promotion30.PromotionDependencyTemplate
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
@@ -9,7 +10,7 @@ object Release : BuildType({
     id("Promote30_Release")
     name = "Promote Release"
 
-    templates(Promotion30Template)
+    templates(Promotion30Template, PromotionDependencyTemplate)
 
     params {
         password("github.token", "", label = "GitHub token", description = "Please specify your GitHub auth token to proceed with the release", display = ParameterDisplay.PROMPT)

diff --git a/.teamcity/Buildship/Promotion30/buildTypes/Snapshot.kt b/.teamcity/Buildship/Promotion30/buildTypes/Snapshot.kt
@@ -1,22 +1,33 @@
 package Buildship.Promotion30.buildTypes
 
+import Buildship.Check30.Checkpoints.buildTypes.Final
 import Buildship.Promotion30.Promotion30Template
+import Buildship.Promotion30.PromotionDependencyTemplate
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.FailureAction
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
 import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
 
 object Snapshot : BuildType({
     id("Promote30_Snapshot")
     name = "Promote Snapshot"
 
-    templates(Promotion30Template)
+    templates(Promotion30Template, PromotionDependencyTemplate)
 
     params {
         param("env.JAVA_HOME", "%linux.java8.oracle.64bit%")
         param("eclipse.release.type", "snapshot")
         param("build.invoker", "ci")
     }
 
+    dependencies {
+        snapshot(Final) {
+            onDependencyFailure = FailureAction.FAIL_TO_START
+            onDependencyCancel = FailureAction.CANCEL
+        }
+        snapshot(Buildship.Check30.CrossVersionCoverage.buildTypes.Eclipse47Java9, Buildship.Check30.Checkpoints.buildTypes.CheckpointUtils.DefaultFailureCondition)
+    }
+
     steps {
         gradle {
             name = "Build and upload update site for Eclipse 4.3 (Kepler)"