diff --git a/common_factories.py b/common_factories.py index 09711ac4..814a3847 100644 --- a/common_factories.py +++ b/common_factories.py @@ -606,22 +606,6 @@ def getRpmAutobakeFactory(mtrDbPool): f_rpm_autobake.workdir = ( f_rpm_autobake.workdir + "/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX/" ) - f_rpm_autobake.addStep( - steps.ShellCommand( - name="fetch packages for MariaDB-compat", - command=[ - "sh", - "-c", - util.Interpolate( - 'wget --no-check-certificate -cO ../MariaDB-shared-5.3.%(kw:arch)s.rpm "%(kw:url)s/helper_files/mariadb-shared-5.3-%(kw:arch)s.rpm" && wget -cO ../MariaDB-shared-10.1.%(kw:arch)s.rpm "%(kw:url)s/helper_files/mariadb-shared-10.1-kvm-rpm-%(kw:rpm_type)s-%(kw:arch)s.rpm"', - arch=getArch, - url=os.getenv("ARTIFACTS_URL", default="https://ci.mariadb.org"), - rpm_type=util.Property("rpm_type"), - ), - ], - doStepIf=hasCompat, - ) - ) f_rpm_autobake.addStep(getSourceTarball()) f_rpm_autobake.addStep(steps.ShellCommand(command="ls ..")) # build steps diff --git a/utils.py b/utils.py index b0f8aa96..813c14ce 100644 --- a/utils.py +++ b/utils.py @@ -472,28 +472,6 @@ def hasEco(props): return False -def hasCompat(step): - builderName = str(step.getProperty("buildername")) - - # For s390x and the listed distros there are no compat files - if any( - builderName.find(sub) != -1 - for sub in { - "s390x", - "fedora", - "alma", - "rocky", - "openeuler", - "suse-15", - "sles-15", - } - ): - return False - if "rhel" in builderName or "centos" in builderName: - return step.getProperty("rpm_type")[-1] in ["7", "8"] - return True - - def hasDockerLibrary(step): # Can only build with a saved package if not savePackage(step):