Change workers for the windows builders

One of the windows builders is currently slow and needs more
investigation. This interchanges amd64-windows and
amd64-windows-packages to ensure that amd64-windows runs fast since it's
used for branch protection.

master-nonlatent/master.cfg

@@ -145,8 +145,8 @@ c["workers"].append(freebds_worker)
 ####### FACTORY CODE
 
 f_windows_env = {
-    "TMP": util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"),
-    "TEMP": util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"),
+   "TMP": util.Interpolate("C:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"),
+   "TEMP": util.Interpolate("C:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"),
 }
 f_windows_env.update(MTR_ENV)
 
@@ -326,9 +326,8 @@ f_windows.addStep(
 ## f_windows_msi
 
 f_windows_msi_env = {
-    "TMP": util.Interpolate("C:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"),
-    "TEMP": util.Interpolate("C:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"),
-    "MTR_FEEDBACK_PLUGIN": "1",
+    "TMP": util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"),
+    "TEMP": util.Interpolate("D:\\Buildbot\\%(prop:buildername)s\\build\\tmpdir"),
 }
 f_windows_msi_env.update(MTR_ENV)
 
@@ -485,7 +484,7 @@ f_windows_msi.addStep(
             "dojob",
             '"',
             util.Interpolate(
-                '"C:\Program Files (x86)\Microsoft Visual Studio\\2022\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=%(kw:arch)s && cd mysql-test && perl mysql-test-run.pl  --verbose-restart --force  --testcase-timeout=8 --suite-timeout=600  --retry=3 --suites=connect,replication --parallel=%(kw:jobs)s %(kw:mtr_additional_args)s',
+                '"C:\Program Files (x86)\Microsoft Visual Studio\\2022\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=%(kw:arch)s && cd mysql-test && perl mysql-test-run.pl  --verbose-restart --force  --testcase-timeout=8 --suite-timeout=600  --retry=3 --suites=connect --parallel=%(kw:jobs)s %(kw:mtr_additional_args)s',
                 mtr_additional_args=util.Property("mtr_additional_args", default=""),
                 jobs=util.Property("jobs", default=4),
                 arch=util.Property("arch", default="x64"),
@@ -993,7 +992,7 @@ c["builders"].append(
 c["builders"].append(
     util.BuilderConfig(
         name="amd64-windows",
-        workernames=["bbw1-windows"],
+        workernames=["bbw2-windows"],
         tags=["Windows", "quick", "protected"],
         collapseRequests=True,
         nextBuild=nextBuild,
@@ -1004,7 +1003,7 @@ c["builders"].append(
 c["builders"].append(
     util.BuilderConfig(
         name="amd64-windows-packages",
-        workernames=["bbw2-windows"],
+        workernames=["bbw1-windows"],
         tags=["Windows", "packages", "zip"],
         collapseRequests=True,
         nextBuild=nextBuild,