Revert tc fix to avoid pre- and post-sweepers run for every service p…

…ackage (#8428) (#5932)

* Revert "Fix the folder to run sweepers (#8425)"

This reverts commit 18d4037c4ba353ac3a93aa9da43c8df2b0d1de46.

* Revert "pre-sweeper and post-sweeper should only run in the google/google-beta package for now (#8423)"

This reverts commit 762c77b0a4e6c28424d08d6cf5951549e109edfd.

Signed-off-by: Modular Magician <magic-modules@google.com>

.changelog/8428.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

.teamcity/components/build_config_package.kt

@@ -32,7 +32,7 @@ class packageDetails(name: String, displayName: String, environment: String, bra
                 // - Compile Test Binary
                 // - Run via jen20/teamcity-go-test
                 // - Post-Sweeper
-                RunAcceptanceTests(providerName, path, packageName)
+                RunAcceptanceTests(path, packageName)
             }
 
             failureConditions {

.teamcity/components/generated/build_components.kt

@@ -51,10 +51,9 @@ fun servicePath(path : String, packageName: String) : String {
     return "./%s/%s".format(path, packageName)
 }
 
-fun BuildSteps.RunAcceptanceTests(providerName : String, path : String, packageName: String) {
+fun BuildSteps.RunAcceptanceTests(path : String, packageName: String) {
     var packagePath = servicePath(path, packageName)
     var withTestsDirectoryPath = "##teamcity[setParameter name='PACKAGE_PATH' value='%s/tests']".format(packagePath)
-    var providerPath = "./%s".format(providerName)
 
     // some packages use a ./tests folder, others don't - conditionally append that if needed
     step(ScriptBuildStep {
@@ -64,7 +63,7 @@ fun BuildSteps.RunAcceptanceTests(providerName : String, path : String, packageN
 
     step(ScriptBuildStep{
         name = "Pre-Sweeper"
-        scriptContent = "go test -v \"$providerPath\" -sweep=\"%SWEEPER_REGIONS%\"  -sweep-allow-failures -sweep-run=\"%SWEEP_RUN%\" -timeout 30m"
+        scriptContent = "go test -v \"%PACKAGE_PATH%\" -sweep=\"%SWEEPER_REGIONS%\"  -sweep-allow-failures -sweep-run=\"%SWEEP_RUN%\" -timeout 30m"
     })
 
     if (useTeamCityGoTest) {
@@ -89,7 +88,7 @@ fun BuildSteps.RunAcceptanceTests(providerName : String, path : String, packageN
 
     step(ScriptBuildStep{
         name = "Post-Sweeper"
-        scriptContent = "go test -v \"$providerPath\" -sweep=\"%SWEEPER_REGIONS%\"  -sweep-allow-failures -sweep-run=\"%SWEEP_RUN%\" -timeout 30m"
+        scriptContent = "go test -v \"%PACKAGE_PATH%\" -sweep=\"%SWEEPER_REGIONS%\"  -sweep-allow-failures -sweep-run=\"%SWEEP_RUN%\" -timeout 30m"
     })
 }