From 521750123ba9a6d20d24d7b267faf4608ca7cf4e Mon Sep 17 00:00:00 2001
From: Sarah French <15078782+SarahFrench@users.noreply.github.com>
Date: Wed, 27 Mar 2024 10:17:38 +0100
Subject: [PATCH] =?UTF-8?q?Rename=20MM=20upstream=20projects=20so=20they'r?=
 =?UTF-8?q?e=20displayed=20under=20'nightly=20tests=E2=80=A6=20(#10294)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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
---
 .../.teamcity/PERFORMING_TASKS_IN_TEAMCITY.md          | 10 +++++-----
 .../components/projects/reused/mm_upstream.kt          |  2 +-
 .../terraform/.teamcity/tests/test_utils.kt            |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mmv1/third_party/terraform/.teamcity/PERFORMING_TASKS_IN_TEAMCITY.md b/mmv1/third_party/terraform/.teamcity/PERFORMING_TASKS_IN_TEAMCITY.md
index 1fd29e99aaa7..cedea2dae66d 100644
--- a/mmv1/third_party/terraform/.teamcity/PERFORMING_TASKS_IN_TEAMCITY.md
+++ b/mmv1/third_party/terraform/.teamcity/PERFORMING_TASKS_IN_TEAMCITY.md
@@ -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/
@@ -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.
 
@@ -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
 
diff --git a/mmv1/third_party/terraform/.teamcity/components/projects/reused/mm_upstream.kt b/mmv1/third_party/terraform/.teamcity/components/projects/reused/mm_upstream.kt
index 9ca0a89b446a..aa04cab704ed 100644
--- a/mmv1/third_party/terraform/.teamcity/components/projects/reused/mm_upstream.kt
+++ b/mmv1/third_party/terraform/.teamcity/components/projects/reused/mm_upstream.kt
@@ -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
diff --git a/mmv1/third_party/terraform/.teamcity/tests/test_utils.kt b/mmv1/third_party/terraform/.teamcity/tests/test_utils.kt
index 162a38eccf5c..3389af8bff87 100644
--- a/mmv1/third_party/terraform/.teamcity/tests/test_utils.kt
+++ b/mmv1/third_party/terraform/.teamcity/tests/test_utils.kt
@@ -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 {