bb.org: s390x skip compat download step

For s390x, there are no compat RPM files to download, so skip the step.
MariaDB · Feb 21, 2022 · 80e49ef · 80e49ef
1 parent 1c7a5ba
commit 80e49ef
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/buildbot.mariadb.org/common_factories.py b/buildbot.mariadb.org/common_factories.py
@@ -61,7 +61,7 @@ def getRpmAutobakeFactory(mtrDbPool):
     f_rpm_autobake= util.BuildFactory()
     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.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 "https://ci.mariadb.org/helper_files/mariadb-shared-5.3-%(kw:arch)s.rpm" && wget -cO ../MariaDB-shared-10.1.%(kw:arch)s.rpm "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'))]))
+    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 "https://ci.mariadb.org/helper_files/mariadb-shared-5.3-%(kw:arch)s.rpm" && wget -cO ../MariaDB-shared-10.1.%(kw:arch)s.rpm "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 .."))

diff --git a/buildbot.mariadb.org/master.cfg b/buildbot.mariadb.org/master.cfg
@@ -959,6 +959,7 @@ c['builders'].append(
       nextBuild=nextBuild,
       canStartBuild=canStartBuild,
       locks=getLocks,
+      properties={'rpm_type': 'sles15'},
       factory=f_rpm_autobake))
 
 c['builders'].append(

diff --git a/buildbot.mariadb.org/utils.py b/buildbot.mariadb.org/utils.py
@@ -184,6 +184,14 @@ def hasEco(props):
             return True
     return False
 
+def hasCompat(step):
+    builderName = str(step.getProperty("buildername"))
+
+    # For s390x there are no compat files
+    if 's390x' in builderName:
+        return False
+    return True
+
 @util.renderer
 def getDockerLibraryNames(props):
     return builders_dockerlibrary[0]