@@ -20,7 +20,7 @@ import replaceCharsId
20
20
21
21
// BuildConfigurationsForPackages accepts a map containing details of multiple packages in a provider and returns a list of build configurations for them all.
22
22
// 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 > {
24
24
val list = ArrayList <BuildType >()
25
25
26
26
// Create build configurations for all packages, except sweeper
@@ -29,7 +29,7 @@ fun BuildConfigurationsForPackages(packages: Map<String, Map<String, String>>, p
29
29
val displayName: String = info.getValue(" displayName" ).toString()
30
30
31
31
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)
33
33
list.add(buildConfig)
34
34
}
35
35
@@ -38,17 +38,18 @@ fun BuildConfigurationsForPackages(packages: Map<String, Map<String, String>>, p
38
38
39
39
// BuildConfigurationForSinglePackage accepts details of a single package in a provider and returns a build configuration for it
40
40
// 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 {
42
42
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)
44
44
}
45
45
46
46
class PackageDetails (private val packageName : String , private val displayName : String , private val providerName : String , private val parentProjectName : String ) {
47
47
48
48
// buildConfiguration returns a BuildType for a service package
49
49
// 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 {
51
51
52
+ val testPrefix = " TestAcc"
52
53
val testTimeout = " 12"
53
54
54
55
var parallelism = DefaultParallelism
0 commit comments