From 7cf70b562819f3effce275ab846df76c5feff912 Mon Sep 17 00:00:00 2001 From: Sinny Kumari Date: Apr 18 2017 11:02:02 +0000 Subject: Extend ABI check for ppc64, ppc64le and aarch64 arch packages Since Fedora 26, primary koji also builds a package for ppc64, ppc64le and aarch64 arches. It is possible to ask taskotron to extend an abicheck task run for these arches --- diff --git a/run_abipkgdiff.py b/run_abipkgdiff.py index ce8f9aa..b1f26a6 100755 --- a/run_abipkgdiff.py +++ b/run_abipkgdiff.py @@ -11,7 +11,7 @@ def enum(**enums): def run_abipkgdiff(koji_build, stable_rpmsdir, update_rpmsdir, - arches=('x86_64', 'i686', 'armv7hl'), artifactsdir='artifacts'): + arches=('x86_64', 'i686', 'armv7hl', 'ppc64le', 'ppc64', 'aarch64'), artifactsdir='artifacts'): # Create artifacts directory if doesn't exist process_start_time = time.time() if not os.path.exists(artifactsdir): @@ -60,7 +60,9 @@ def test_arch(arch, stable_rpmsdir, update_rpmsdir, detail): # Get debuginfo rpm for specified architecture for rpm in os.listdir(stable_rpmsdir): - if arch in rpm: + # dot(.) is needed during search to avoid getting result from ppc64le + # arch while searching fro ppc64 + if (arch + ".") in rpm: if 'debuginfo' in rpm: stable_debuginfo_rpm.append(rpm) else: @@ -76,7 +78,9 @@ def test_arch(arch, stable_rpmsdir, update_rpmsdir, detail): abipkgdiff on them ''' for rpm in os.listdir(update_rpmsdir): - if arch in rpm: + if (arch + ".") in rpm: + # dot(.) is needed during search to avoid getting result from ppc64le + # arch while searching fro ppc64 if 'debuginfo' in rpm: update_debuginfo_rpm.append(rpm) else: @@ -113,8 +117,9 @@ def test_arch(arch, stable_rpmsdir, update_rpmsdir, detail): for update_rpm in update_rpms_detail: for stable_rpm in stable_rpms_detail: - if stable_rpm['name'] != update_rpm['name']: - continue + if (stable_rpm['name'] != update_rpm['name']) or \ + (stable_rpm['arch'] != update_rpm['arch']): + continue update_rpms.remove(update_rpm['rpm']) stable_rpms.remove(stable_rpm['rpm']) diff --git a/runtask.yml b/runtask.yml index 31f74f1..63ec511 100755 --- a/runtask.yml +++ b/runtask.yml @@ -17,7 +17,7 @@ actions: koji: action: download_latest_stable koji_build: ${koji_build} - arch: ['all'] + arch: ['x86_64', 'i386', 'armv7hl', 'ppc64le', 'ppc64', 'aarch64'] arch_exclude: ['noarch'] debuginfo: True target_dir: ${workdir}/stable @@ -26,7 +26,7 @@ actions: koji: action: download koji_build: ${koji_build} - arch: ['all'] + arch: ['x86_64', 'i386', 'armv7hl', 'ppc64le', 'ppc64', 'aarch64'] arch_exclude: ['noarch'] debuginfo: True target_dir: ${workdir}/update