diff --git a/mmv1/third_party/terraform/.teamcity/components/projects/feature_branches/FEATURE-BRANCH-major-release-6.0.0.kt b/mmv1/third_party/terraform/.teamcity/components/projects/feature_branches/FEATURE-BRANCH-major-release-6.0.0.kt deleted file mode 100644 index 705e20671b6a..000000000000 --- a/mmv1/third_party/terraform/.teamcity/components/projects/feature_branches/FEATURE-BRANCH-major-release-6.0.0.kt +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: MPL-2.0 - */ - -// This file is controlled by MMv1, any changes made here will be overwritten - -package projects.feature_branches - -import ProviderNameBeta -import ProviderNameGa -import builds.* -import jetbrains.buildServer.configs.kotlin.Project -import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot -import projects.reused.nightlyTests -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 = """ - +:(refs/heads/*) - -:refs/pulls/* - """.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 = """ - +:(refs/heads/*) - -:refs/pulls/* - """.trimIndent() -}) - -fun featureBranchMajorRelease600_Project(allConfig: AllContextParameters): Project { - - val projectId = replaceCharsId(branchName) - val gaProjectId = replaceCharsId(projectId + "_GA") - val betaProjectId= replaceCharsId(projectId + "_BETA") - - // Get config for using the GA and Beta identities - val gaConfig = getGaAcceptanceTestConfig(allConfig) - val betaConfig = getBetaAcceptanceTestConfig(allConfig) - - return Project{ - id(projectId) - name = "6.0.0 Major Release Testing" - description = "Subproject for testing feature branch $branchName" - - // Register feature branch-specific VCS roots in the project - vcsRoot(HashicorpVCSRootGa_featureBranchMajorRelease600) - vcsRoot(HashicorpVCSRootBeta_featureBranchMajorRelease600) - - // Nested Nightly Test project that uses hashicorp/terraform-provider-google - subProject( - Project{ - id(gaProjectId) - name = "Google" - subProject( - nightlyTests( - gaProjectId, - ProviderNameGa, - HashicorpVCSRootGa_featureBranchMajorRelease600, - gaConfig, - NightlyTriggerConfiguration( - branch = "refs/heads/${branchName}", // Make triggered builds use the feature branch - daysOfWeek = "5" // Thursday for GA, TeamCity numbers days Sun=1...Sat=7 - ), - ) - ) - } - ) - - // Nested Nightly Test project that uses hashicorp/terraform-provider-google-beta - subProject( - Project { - id(betaProjectId) - name = "Google Beta" - subProject( - nightlyTests( - betaProjectId, - ProviderNameBeta, - HashicorpVCSRootBeta_featureBranchMajorRelease600, - betaConfig, - NightlyTriggerConfiguration( - branch = "refs/heads/${branchName}", // Make triggered builds use the feature branch - daysOfWeek="6" // Friday for Beta, TeamCity numbers days Sun=1...Sat=7 - ), - ) - ) - } - ) - - params { - readOnlySettings() - } - } -} \ No newline at end of file diff --git a/mmv1/third_party/terraform/.teamcity/components/projects/google_beta_subproject.kt b/mmv1/third_party/terraform/.teamcity/components/projects/google_beta_subproject.kt index ca9c45d7c8c7..a80aadd6d889 100644 --- a/mmv1/third_party/terraform/.teamcity/components/projects/google_beta_subproject.kt +++ b/mmv1/third_party/terraform/.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/mmv1/third_party/terraform/.teamcity/components/projects/google_ga_subproject.kt b/mmv1/third_party/terraform/.teamcity/components/projects/google_ga_subproject.kt index 9e7e2caa2844..cd45d7d754c8 100644 --- a/mmv1/third_party/terraform/.teamcity/components/projects/google_ga_subproject.kt +++ b/mmv1/third_party/terraform/.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/mmv1/third_party/terraform/.teamcity/components/projects/root_project.kt b/mmv1/third_party/terraform/.teamcity/components/projects/root_project.kt index 208cfc9617da..7130a9c35ea8 100644 --- a/mmv1/third_party/terraform/.teamcity/components/projects/root_project.kt +++ b/mmv1/third_party/terraform/.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() }