MDBF-961: Fixup master-refactor windows save packages

Stray comma (,) split a single string into two arguments for
util.Interpolate

Unify both f_windows_msi and f_windows to use a single function call.

Author: cvicentiu

master-nonlatent/master.cfg

@@ -250,23 +250,23 @@ for typ in windows_tests:
     )
 
 
-f_windows.addStep(
-    steps.DirectoryUpload(
+def windows_save_logs_step():
+    return steps.DirectoryUpload(
         name="save mariadb log files",
         alwaysRun=True,
         workersrc="buildbot\\logs\\",
         masterdest=util.Interpolate(
             "/srv/buildbot/packages/"
-            + "%(prop:tarbuildnum)s"
-            + "/logs/"
-            + "%(prop:buildername)s"
+            + "%(prop:tarbuildnum)s/logs/%(prop:buildername)s"
         ),
         url=util.Interpolate(
-            os.environ["ARTIFACTS_URL"],
-            "/" "%(prop:tarbuildnum)s" "/" "logs" "/" "%(prop:buildername)s" "/",
+            os.environ["ARTIFACTS_URL"]
+            + "/%(prop:tarbuildnum)s/logs/%(prop:buildername)s/",
         ),
     )
-)
+
+
+f_windows.addStep(windows_save_logs_step())
 f_windows.addStep(
     steps.ShellCommand(
         name="cleanup",
@@ -438,29 +438,8 @@ for typ in windows_msi_tests:
         create_scripts=windows_msi_tests[typ].get("create_scripts", False),
     )
 
-f_windows_msi.addStep(
-    steps.DirectoryUpload(
-        name="save mariadb log files",
-        alwaysRun=True,
-        workersrc="buildbot\\logs\\",
-        masterdest=util.Interpolate(
-            "/srv/buildbot/packages/"
-            + "%(prop:tarbuildnum)s"
-            + "/logs/"
-            + "%(prop:buildername)s"
-        ),
-        url=util.Interpolate(
-            f'{os.environ["ARTIFACTS_URL"]}'
-            "/"
-            "%(prop:tarbuildnum)s"
-            "/"
-            "logs"
-            "/"
-            "%(prop:buildername)s"
-            "/"
-        ),
-    )
-)
+f_windows_msi.addStep(windows_save_logs_step())
+
 # create package and upload to master
 f_windows_msi.addStep(steps.ShellCommand(command='dojob "dir"'))
 f_windows_msi.addStep(