Skip to content

Commit f4f9908

Browse files
TeamCity: Remove Epemeral Write-Only Subproject (#13332) (#21881)
[upstream:62b2cd65acad2a3f9f1315942e6b2d764accfe6a] Signed-off-by: Modular Magician <[email protected]>
1 parent f2df0c1 commit f4f9908

File tree

6 files changed

+9
-226
lines changed

6 files changed

+9
-226
lines changed

.changelog/13332.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

.teamcity/components/builds/build_configuration_per_package.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import replaceCharsId
2020

2121
// BuildConfigurationsForPackages accepts a map containing details of multiple packages in a provider and returns a list of build configurations for them all.
2222
// Intended to be used in projects where we're testing all packages, e.g. the nightly test projects
23-
fun BuildConfigurationsForPackages(packages: Map<String, Map<String, String>>, providerName: String, parentProjectName: String, vcsRoot: GitVcsRoot, sharedResources: List<String>, environmentVariables: AccTestConfiguration, testPrefix: String = "TestAcc"): List<BuildType> {
23+
fun BuildConfigurationsForPackages(packages: Map<String, Map<String, String>>, providerName: String, parentProjectName: String, vcsRoot: GitVcsRoot, sharedResources: List<String>, environmentVariables: AccTestConfiguration): List<BuildType> {
2424
val list = ArrayList<BuildType>()
2525

2626
// Create build configurations for all packages, except sweeper
@@ -29,7 +29,7 @@ fun BuildConfigurationsForPackages(packages: Map<String, Map<String, String>>, p
2929
val displayName: String = info.getValue("displayName").toString()
3030

3131
val pkg = PackageDetails(packageName, displayName, providerName, parentProjectName)
32-
val buildConfig = pkg.buildConfiguration(path, vcsRoot, sharedResources, environmentVariables, testPrefix = testPrefix)
32+
val buildConfig = pkg.buildConfiguration(path, vcsRoot, sharedResources, environmentVariables)
3333
list.add(buildConfig)
3434
}
3535

@@ -38,17 +38,18 @@ fun BuildConfigurationsForPackages(packages: Map<String, Map<String, String>>, p
3838

3939
// BuildConfigurationForSinglePackage accepts details of a single package in a provider and returns a build configuration for it
4040
// Intended to be used in short-lived projects where we're testing specific packages, e.g. feature branch testing
41-
fun BuildConfigurationForSinglePackage(packageName: String, packagePath: String, packageDisplayName: String, providerName: String, parentProjectName: String, vcsRoot: GitVcsRoot, sharedResources: List<String>, environmentVariables: AccTestConfiguration, testPrefix: String = "TestAcc"): BuildType{
41+
fun BuildConfigurationForSinglePackage(packageName: String, packagePath: String, packageDisplayName: String, providerName: String, parentProjectName: String, vcsRoot: GitVcsRoot, sharedResources: List<String>, environmentVariables: AccTestConfiguration): BuildType{
4242
val pkg = PackageDetails(packageName, packageDisplayName, providerName, parentProjectName)
43-
return pkg.buildConfiguration(packagePath, vcsRoot, sharedResources, environmentVariables, testPrefix = testPrefix)
43+
return pkg.buildConfiguration(packagePath, vcsRoot, sharedResources, environmentVariables)
4444
}
4545

4646
class PackageDetails(private val packageName: String, private val displayName: String, private val providerName: String, private val parentProjectName: String) {
4747

4848
// buildConfiguration returns a BuildType for a service package
4949
// For BuildType docs, see https://teamcity.jetbrains.com/app/dsl-documentation/root/build-type/index.html
50-
fun buildConfiguration(path: String, vcsRoot: GitVcsRoot, sharedResources: List<String>, environmentVariables: AccTestConfiguration, buildTimeout: Int = DefaultBuildTimeoutDuration, testPrefix: String): BuildType {
50+
fun buildConfiguration(path: String, vcsRoot: GitVcsRoot, sharedResources: List<String>, environmentVariables: AccTestConfiguration, buildTimeout: Int = DefaultBuildTimeoutDuration): BuildType {
5151

52+
val testPrefix = "TestAcc"
5253
val testTimeout = "12"
5354

5455
var parallelism = DefaultParallelism

.teamcity/components/projects/feature_branches/FEATURE-BRANCH-ephemeral-write-only.kt

Lines changed: 0 additions & 84 deletions
This file was deleted.

.teamcity/components/projects/feature_branches/get_services.kt

Lines changed: 0 additions & 56 deletions
This file was deleted.

.teamcity/components/projects/root_project.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import generated.ServicesListBeta
1818
import generated.ServicesListGa
1919
import jetbrains.buildServer.configs.kotlin.Project
2020
import jetbrains.buildServer.configs.kotlin.sharedResource
21-
import projects.feature_branches.featureBranchEphemeralWriteOnlySubProject
2221

2322
// googleCloudRootProject returns a root project that contains a subprojects for the GA and Beta version of the
2423
// Google provider. There are also resources to help manage the test projects used for acceptance tests.
@@ -62,7 +61,6 @@ fun googleCloudRootProject(allConfig: AllContextParameters): Project {
6261
subProject(googleSubProjectGa(allConfig))
6362
subProject(googleSubProjectBeta(allConfig))
6463
subProject(projectSweeperSubProject(allConfig))
65-
subProject(featureBranchEphemeralWriteOnlySubProject(allConfig))
6664

6765
// Feature branch-testing projects - these will be added and removed as needed
6866

.teamcity/tests/FEATURE-BRANCH-ephemera-write-only.kt

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)