Remove testing of 6.0.0 feature branch, resume testing main branch al…

…l week days (#11557) (#19287) [upstream:f625ca5e5eb9a417df4d72d91c811ea53ce164e4] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Aug 27, 2024 · 33db873 · 33db873
1 parent eef7f65
commit 33db873
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 112 deletions.
diff --git a/.changelog/11557.txt b/.changelog/11557.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/.teamcity/components/projects/feature_branches/FEATURE-BRANCH-major-release-6.0.0.kt b/.teamcity/components/projects/feature_branches/FEATURE-BRANCH-major-release-6.0.0.kt
diff --git a/.teamcity/components/projects/google_beta_subproject.kt b/.teamcity/components/projects/google_beta_subproject.kt
@@ -32,7 +32,7 @@ fun googleSubProjectBeta(allConfig: AllContextParameters): Project {
         description = "Subproject containing builds for testing the Beta version of the Google provider"
 
         // Nightly Test project that uses hashicorp/terraform-provider-google-beta
-        subProject(nightlyTests(betaId, ProviderNameBeta, HashiCorpVCSRootBeta, betaConfig, NightlyTriggerConfiguration(daysOfWeek="1-5,7"))) // All nights except Friday (6) for Beta; feature branch testing happens on Fridays and TeamCity numbers days Sun=1...Sat=7
+        subProject(nightlyTests(betaId, ProviderNameBeta, HashiCorpVCSRootBeta, betaConfig, NightlyTriggerConfiguration()))
 
         // MM Upstream project that uses modular-magician/terraform-provider-google-beta
         subProject(mmUpstream(betaId, ProviderNameBeta, ModularMagicianVCSRootBeta, HashiCorpVCSRootBeta, vcrConfig, NightlyTriggerConfiguration()))

diff --git a/.teamcity/components/projects/google_ga_subproject.kt b/.teamcity/components/projects/google_ga_subproject.kt
@@ -31,7 +31,7 @@ fun googleSubProjectGa(allConfig: AllContextParameters): Project {
         description = "Subproject containing builds for testing the GA version of the Google provider"
 
         // Nightly Test project that uses hashicorp/terraform-provider-google
-        subProject(nightlyTests(gaId, ProviderNameGa, HashiCorpVCSRootGa, gaConfig, NightlyTriggerConfiguration(daysOfWeek="1-4,6-7"))) // All nights except Thursday (5) for GA; feature branch testing happens on Thursdays and TeamCity numbers days Sun=1...Sat=7
+        subProject(nightlyTests(gaId, ProviderNameGa, HashiCorpVCSRootGa, gaConfig, NightlyTriggerConfiguration()))
 
         // MM Upstream project that uses modular-magician/terraform-provider-google
         subProject(mmUpstream(gaId, ProviderNameGa, ModularMagicianVCSRootGa, HashiCorpVCSRootGa, vcrConfig, NightlyTriggerConfiguration()))

diff --git a/.teamcity/components/projects/root_project.kt b/.teamcity/components/projects/root_project.kt
@@ -18,8 +18,6 @@ import generated.ServicesListBeta
 import generated.ServicesListGa
 import jetbrains.buildServer.configs.kotlin.Project
 import jetbrains.buildServer.configs.kotlin.sharedResource
-import projects.feature_branches.featureBranchMajorRelease600_Project
-
 
 // googleCloudRootProject returns a root project that contains a subprojects for the GA and Beta version of the
 // Google provider. There are also resources to help manage the test projects used for acceptance tests.
@@ -64,9 +62,6 @@ fun googleCloudRootProject(allConfig: AllContextParameters): Project {
         subProject(googleSubProjectBeta(allConfig))
         subProject(projectSweeperSubProject(allConfig))
 
-        // Feature branch testing
-        subProject(featureBranchMajorRelease600_Project(allConfig)) // FEATURE-BRANCH-major-release-6.0.0
-
         params {
             readOnlySettings()
         }