@@ -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
4646class 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
0 commit comments