TeamCity: Fix references to branches in 6.0.0 testing projects (Googl…

…eCloudPlatform#11143)
SarahFrench · Jul 11, 2024 · f6d628a · f6d628a
1 parent 6d7694e
commit f6d628a
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...form/.teamcity/components/projects/feature_branches/FEATURE-BRANCH-major-release-6.0.0.kt b/...form/.teamcity/components/projects/feature_branches/FEATURE-BRANCH-major-release-6.0.0.kt
@@ -24,7 +24,8 @@ object HashicorpVCSRootGa_featureBranchMajorRelease600: GitVcsRoot({
     url = "https://github.com/hashicorp/terraform-provider-${ProviderNameGa}"
     branch = "refs/heads/${branchName}"
     branchSpec = """
-        +:FEATURE-BRANCH-major-release-6*
+        +:(refs/heads/*)
+        -:refs/pulls/*
     """.trimIndent()
 })
 
@@ -33,7 +34,8 @@ object HashicorpVCSRootBeta_featureBranchMajorRelease600: GitVcsRoot({
     url = "https://github.com/hashicorp/terraform-provider-${ProviderNameBeta}"
     branch = "refs/heads/${branchName}"
     branchSpec = """
-        +:FEATURE-BRANCH-major-release-6*
+        +:(refs/heads/*)
+        -:refs/pulls/*
     """.trimIndent()
 })
 
@@ -68,7 +70,7 @@ fun featureBranchMajorRelease600_Project(allConfig: AllContextParameters): Proje
                         HashicorpVCSRootGa_featureBranchMajorRelease600,
                         gaConfig,
                         NightlyTriggerConfiguration(
-                            branch = branchName, // Make triggered builds use the feature branch
+                            branch = "refs/heads/${branchName}", // Make triggered builds use the feature branch
                             daysOfWeek = "5"     // Thursday for GA, TeamCity numbers days Sun=1...Sat=7
                         ), 
                     )
@@ -88,7 +90,7 @@ fun featureBranchMajorRelease600_Project(allConfig: AllContextParameters): Proje
                         HashicorpVCSRootBeta_featureBranchMajorRelease600,
                         betaConfig,
                         NightlyTriggerConfiguration(
-                            branch = branchName, // Make triggered builds use the feature branch
+                            branch = "refs/heads/${branchName}", // Make triggered builds use the feature branch
                             daysOfWeek="6"       // Friday for Beta, TeamCity numbers days Sun=1...Sat=7
                         ),
                     )