diff --git a/common_factories.py b/common_factories.py index 4184302c..7d24dfca 100644 --- a/common_factories.py +++ b/common_factories.py @@ -97,32 +97,19 @@ def getRpmAutobakeFactory(mtrDbPool): steps.ShellCommand( name="Fetch packages for MariaDB-compat", command=util.Interpolate( - "wget --no-check-certificate -cO ../MariaDB-shared-5.3.%(kw:arch)s.rpm" + "wget --no-check-certificate -cO ../MariaDB-shared-5.3.%(kw:arch)s.rpm " + os.getenv("ARTIFACTS_URL", default="https://ci.mariadb.org") - + "/helper_files/mariadb-shared-5.3-%(kw:arch)s.rpm", + + "/helper_files/mariadb-shared-5.3-%(kw:arch)s.rpm" + + "&&" + + "wget --no-check-certificate -cO ../MariaDB-shared-10.1.%(kw:arch)s.rpm " + + 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, - ) - ) f_rpm_autobake.addStep(downloadSourceTarball()) f_rpm_autobake.addStep(steps.ShellCommand(command=util.Interpolate("tar -xvzf /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"))) f_rpm_autobake.addStep(steps.ShellCommand(command="ls .."))