Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MDEV-35512 remove RPM compat #646

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

MDEV-35512 remove RPM compat #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions common_factories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 0 additions & 22 deletions utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down