s

MariaDB · Oct 16, 2023 · 6280f46 · 6280f46
1 parent e0a349e
commit 6280f46
Showing 1 changed file with 27 additions and 27 deletions.
diff --git a/common_factories.py b/common_factories.py
@@ -94,35 +94,35 @@ def getRpmAutobakeFactory(mtrDbPool):
     f_rpm_autobake.addStep(steps.SetProperty(property="dockerfile", value=util.Interpolate("%(kw:url)s", url=dockerfile), description="dockerfile"))
     f_rpm_autobake.workdir=f_rpm_autobake.workdir + "/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX/"
     f_rpm_autobake.addStep(
-        steps.ShellSequence(
+        steps.ShellCommand(
             name="Fetch packages for MariaDB-compat",
-            commands=[
-                util.ShellArg(
-                    command=[
-                        "wget",
-                        "--no-check-certificate",
-                        "-cO",
-                        "../MariaDB-shared-5.3.%(kw:arch)s.rpm",
-                        util.Interpolate(
-                            os.getenv("ARTIFACTS_URL", default="https://ci.mariadb.org")
-                            + "/helper_files/mariadb-shared-5.3-%(kw:arch)s.rpm",
-                            arch=getArch,
-                        ),
-                    ],
+            command=[
+                "wget",
+                "--no-check-certificate",
+                "-cO",
+                "../MariaDB-shared-5.3.%(kw:arch)s.rpm",
+                util.Interpolate(
+                    os.getenv("ARTIFACTS_URL", default="https://ci.mariadb.org")
+                    + "/helper_files/mariadb-shared-5.3-%(kw:arch)s.rpm",
+                    arch=getArch,
                 ),
-                util.ShellArg(
-                    command=[
-                        "wget",
-                        "--no-check-certificate",
-                        "-cO",
-                        "../MariaDB-shared-10.1.%(kw:arch)s.rpm",
-                        util.Interpolate(
-                            os.getenv("ARTIFACTS_URL", default="https://ci.mariadb.org")
-                            + "/helper_files/mariadb-shared-10.1-kvm-rpm-%(kw:rpm_type)s-%(kw:arch)s.rpm",
-                            arch=getArch,
-                            rpm_type=util.Property("rpm_type"),
-                        ),
-                    ],
+            ],
+            doStepIf=hasCompat,
+        )
+    )
+    f_rpm_autobake.addStep(
+        steps.ShellCommand(
+            name="Fetch packages for MariaDB-shared",
+            command=[
+                "wget",
+                "--no-check-certificate",
+                "-cO",
+                "../MariaDB-shared-10.1.%(kw:arch)s.rpm",
+                util.Interpolate(
+                    os.getenv("ARTIFACTS_URL", default="https://ci.mariadb.org")
+                    + "/helper_files/mariadb-shared-10.1-kvm-rpm-%(kw:rpm_type)s-%(kw:arch)s.rpm",
+                    arch=getArch,
+                    rpm_type=util.Property("rpm_type"),
                 ),
             ],
             doStepIf=hasCompat,