Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DO NOT MERGE UNTIL 6.0.0] Remove testing of FEATURE-BRANCH-major-release-6.0.0, resume testing main branch all weekdays #8

Closed
wants to merge 1 commit into from
Closed

[DO NOT MERGE UNTIL 6.0.0] Remove testing of FEATURE-BRANCH-major-release-6.0.0, resume testing main branch all weekdays #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 0 additions & 105 deletions ...form/.teamcity/components/projects/feature_branches/FEATURE-BRANCH-major-release-6.0.0.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion mmv1/third_party/terraform/.teamcity/components/projects/google_beta_subproject.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()))
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/terraform/.teamcity/components/projects/google_ga_subproject.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()))
Expand Down
5 changes: 0 additions & 5 deletions mmv1/third_party/terraform/.teamcity/components/projects/root_project.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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()
}
Expand Down
Loading