Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cherry pick promotion changes from master
- Loading branch information
1 parent
365383d
commit ba204dd
Showing
24 changed files
with
414 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * Copyright 2022 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package common | ||
|
|
||
| interface Jvm { | ||
| val version: JvmVersion | ||
| val vendor: JvmVendor | ||
| } | ||
|
|
||
| data class DefaultJvm( | ||
| override val version: JvmVersion, | ||
| override val vendor: JvmVendor | ||
| ) : Jvm | ||
|
|
||
| object BuildToolBuildJvm : Jvm { | ||
| override val version: JvmVersion | ||
| get() = JvmVersion.java11 | ||
| override val vendor: JvmVendor | ||
| get() = JvmVendor.openjdk | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
.teamcity/src/main/kotlin/promotion/BasePublishGradleDistribution.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Copyright 2019 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package promotion | ||
|
|
||
| import common.gradleWrapper | ||
| import jetbrains.buildServer.configs.kotlin.v2019_2.BuildSteps | ||
| import jetbrains.buildServer.configs.kotlin.v2019_2.RelativeId | ||
| import vcsroots.gradlePromotionMaster | ||
|
|
||
| abstract class BasePublishGradleDistribution( | ||
| // The branch to be promoted | ||
| val promotedBranch: String, | ||
| val prepTask: String, | ||
| val triggerName: String, | ||
| val gitUserName: String = "bot-teamcity", | ||
| val gitUserEmail: String = "bot-teamcity@gradle.com", | ||
| val extraParameters: String = "", | ||
| vcsRootId: String = gradlePromotionMaster, | ||
| cleanCheckout: Boolean = true | ||
| ) : BasePromotionBuildType(vcsRootId, cleanCheckout) { | ||
|
|
||
| init { | ||
| artifactRules = """ | ||
| **/build/git-checkout/subprojects/base-services/build/generated-resources/build-receipt/org/gradle/build-receipt.properties | ||
| **/build/distributions/*.zip => promote-build-distributions | ||
| **/build/website-checkout/data/releases.xml | ||
| **/build/git-checkout/build/reports/integTest/** => distribution-tests | ||
| **/smoke-tests/build/reports/tests/** => post-smoke-tests | ||
| **/build/version-info.properties => version-info.properties | ||
| """.trimIndent() | ||
|
|
||
| dependencies { | ||
| snapshot(RelativeId("Check_Stage_${this@BasePublishGradleDistribution.triggerName}_Trigger")) { | ||
| synchronizeRevisions = false | ||
| } | ||
| } | ||
|
|
||
| steps { | ||
| buildStep( | ||
| this@BasePublishGradleDistribution.extraParameters, | ||
| this@BasePublishGradleDistribution.gitUserName, | ||
| this@BasePublishGradleDistribution.gitUserEmail, | ||
| this@BasePublishGradleDistribution.triggerName, | ||
| this@BasePublishGradleDistribution.prepTask, | ||
| "checkNeedToPromote" | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun BuildSteps.buildStep(extraParameters: String, gitUserName: String, gitUserEmail: String, triggerName: String, prepTask: String, stepTask: String) { | ||
| gradleWrapper { | ||
| name = "Promote" | ||
| tasks = "$prepTask $stepTask" | ||
| gradleParams = """-PcommitId=%dep.${RelativeId("Check_Stage_${triggerName}_Trigger")}.build.vcs.number% $extraParameters "-PgitUserName=$gitUserName" "-PgitUserEmail=$gitUserEmail" %additional.gradle.parameters% """ | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 0 additions & 71 deletions
71
.teamcity/src/main/kotlin/promotion/PublishGradleDistribution.kt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.