Skip to content

Commit

Permalink
Rename MM upstream projects so they're displayed under 'nightly tests… (
Browse files Browse the repository at this point in the history
GoogleCloudPlatform#10294)

* Rename MM upstream projects so they're displayed under 'nightly tests' in alphabetical lists

* Update "MM Upstream Testing" to "Upstream MM Testing" elsewhere in codebase
  • Loading branch information
SarahFrench authored and pengq-google committed May 21, 2024
1 parent 9f7c760 commit ccc7204
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ Google Cloud/
├─ Google/
│ ├─ Nightly Tests
│ ├─ MM Upstream Testing
│ ├─ Upstream MM Testing
├─ Google Beta/
│ ├─ Nightly Tests
│ ├─ MM Upstream Testing
│ ├─ Upstream MM Testing
│ ├─ VCR Recording
├─ Project Sweeper/
Expand Down Expand Up @@ -70,8 +70,8 @@ To use a release branch, or any other branch that isn't main, use [the `Build br
When reviewing a PR you may need to run acceptance tests using the code shown in the Diff Report, present in branches in the modular-magician/terraform-provider-google(-beta) repositories.

To do this you should navigate to either of these projects and run a custom build:
* `Google > MM Upstream Testing`
* `Google Beta > MM Upstream Testing`
* `Google > Upstream MM Testing`
* `Google Beta > Upstream MM Testing`

Builds in these projects will test the code present in the Modular Magician's forks and will run tests against the VCR testing project in GCP.

Expand Down Expand Up @@ -106,7 +106,7 @@ The Service Sweeper builds in `Google > Nightly Tests` and `Google Beta > Nightl

### Sweeping the VCR Project

The Service Sweeper builds in `Google > MM Upstream Testing` and `Google Beta > MM Upstream Testing` run every night via CRON. They are redundant as both sweep the VCR project, but I've left them both in. They are designed to not run until there are no builds testing any services in the VCR test GCP project. No acceptance testing builds will start until the sweeper stops.
The Service Sweeper builds in `Google > Upstream MM Testing` and `Google Beta > Upstream MM Testing` run every night via CRON. They are redundant as both sweep the VCR project, but I've left them both in. They are designed to not run until there are no builds testing any services in the VCR test GCP project. No acceptance testing builds will start until the sweeper stops.

### Sweeping `google_project` Resources

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fun mmUpstream(parentProject: String, providerName: String, vcsRoot: GitVcsRoot,

return Project {
id(projectId)
name = "MM Upstream Testing"
name = "Upstream MM Testing"
description = "A project connected to the modular-magician/terraform-provider-${providerName} repository, to let users trigger ad-hoc builds against branches for PRs"

// Register build configs in the project
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/terraform/.teamcity/tests/test_utils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import org.junit.Assert
const val gaProjectName = "Google"
const val betaProjectName = "Google Beta"
const val nightlyTestsProjectName = "Nightly Tests"
const val mmUpstreamProjectName = "MM Upstream Testing"
const val mmUpstreamProjectName = "Upstream MM Testing"
const val projectSweeperProjectName = "Project Sweeper"

fun testContextParameters(): AllContextParameters {
Expand Down

0 comments on commit ccc7204

Please sign in to comment.