Make 6.0 project builds use feature branch

mmv1/third_party/terraform/.teamcity/components/projects/feature_branches/FEATURE-BRANCH-major-release-6.0.0.kt

@@ -17,21 +17,24 @@ import replaceCharsId
 
 const val branchName = "FEATURE-BRANCH-major-release-6.0.0"
 
-
 // VCS Roots specifically for pulling code from the feature branches in the downstream repos
 
 object HashicorpVCSRootGa_featureBranchMajorRelease600: GitVcsRoot({
     name = "VCS root for the hashicorp/terraform-provider-${ProviderNameGa} repo @ refs/heads/${branchName}"
     url = "https://github.com/hashicorp/terraform-provider-${ProviderNameGa}"
     branch = "refs/heads/${branchName}"
-    branchSpec = "" // empty as we'll access no other branches
+    branchSpec = """
+        +:FEATURE-BRANCH-major-release-6*
+    """.trimIndent()
 })
 
 object HashicorpVCSRootBeta_featureBranchMajorRelease600: GitVcsRoot({
     name = "VCS root for the hashicorp/terraform-provider-${ProviderNameBeta} repo @ refs/heads/${branchName}"
     url = "https://github.com/hashicorp/terraform-provider-${ProviderNameBeta}"
     branch = "refs/heads/${branchName}"
-    branchSpec = "" // empty as we'll access no other branches
+    branchSpec = """
+        +:FEATURE-BRANCH-major-release-6*
+    """.trimIndent()
 })
 
 fun featureBranchMajorRelease600_Project(allConfig: AllContextParameters): Project {
@@ -64,7 +67,10 @@ fun featureBranchMajorRelease600_Project(allConfig: AllContextParameters): Proje
                         ProviderNameGa,
                         HashicorpVCSRootGa_featureBranchMajorRelease600,
                         gaConfig,
-                        NightlyTriggerConfiguration(daysOfWeek="5"), // Thursday for GA, TeamCity numbers days Sun=1...Sat=7
+                        NightlyTriggerConfiguration(
+                            branch = branchName, // Make triggered builds use the feature branch
+                            daysOfWeek = "5"     // Thursday for GA, TeamCity numbers days Sun=1...Sat=7
+                        ), 
                     )
                 )
             }
@@ -81,7 +87,10 @@ fun featureBranchMajorRelease600_Project(allConfig: AllContextParameters): Proje
                         ProviderNameBeta,
                         HashicorpVCSRootBeta_featureBranchMajorRelease600,
                         betaConfig,
-                        NightlyTriggerConfiguration(daysOfWeek="6"), // Friday for Beta, TeamCity numbers days Sun=1...Sat=7
+                        NightlyTriggerConfiguration(
+                            branch = branchName, // Make triggered builds use the feature branch
+                            daysOfWeek="6"       // Friday for Beta, TeamCity numbers days Sun=1...Sat=7
+                        ),
                     )
                 )
             }