Differential D1037

arch_utils: add alternate arches
ClosedPublic
Actions

Authored by kparal on Oct 26 2016, 2:49 PM.

Details

Reviewers
mkrizek
Group Reviewers
libtaskotron
Commits
rLTRN709a35234b11: arch_utils: add alternate arches
Summary

Koji now builds all arches in its primary instance. This adds their
definitions so that we're aware of them.

This patch was triggered by redefining how secondary (now alternate)
architectures are handled in Fedora. All alternate arches will now be
built and served from the primary Koji instance, thus the need to adjust
this in libtaskotron. Read more at:

Test Plan

I just tried running task-rpmlint. This should not affect any tasks.

Diff Detail

Repository
rLTRN libtaskotron
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
kparal retitled this revision from to arch_utils: add alternate arches.Oct 26 2016, 2:49 PM
kparal updated this object.
kparal edited the test plan for this revision. (Show Details)
kparal added a reviewer: libtaskotron.
mkrizek accepted this revision.Oct 27 2016, 10:36 AM
mkrizek added a reviewer: mkrizek.
mkrizek added a subscriber: mkrizek.

LGTM

This revision is now accepted and ready to land.Oct 27 2016, 10:36 AM
Closed by commit rLTRN709a35234b11: arch_utils: add alternate arches (authored by kparal). · Explain WhyOct 27 2016, 11:57 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 2654

View Options

libtaskotron/arch_utils.py

Show All 9 Lines
10 10​
11class Arches(object): 11​class Arches(object):
12 ''' 12​ '''
13 Helper class for working with supported architectures inside taskotron 13​ Helper class for working with supported architectures inside taskotron
14 ''' 14​ '''
15 15​
16 #: a mapping from base arches to concrete binary arches 16​ #: a mapping from base arches to concrete binary arches
17 binary = { 17​ binary = {
18 'i386': ['i386', 'i486', 'i586', 'i686'], 18​ 'i386': ['i386', 'i486', 'i586', 'i686'],
19 'x86_64': ['x86_64'], 19​ 'x86_64': ['x86_64'],
20 'armhfp': ['armhfp', 'armv7hl'], 20​ 'armhfp': ['armhfp', 'armv7hl'],
21​ 'aarch64': ['aarch64'],
22​ 'ppc64': ['ppc64'],
23​ 'ppc64le': ['ppc64le'],
24​ 's390x': ['s390x'],
21 } 25​ }
22 26​
23 #: base architectures 27​ #: base architectures
24 base = binary.keys() 28​ base = binary.keys()
25 29​
26 #: meta arches 30​ #: meta arches
27 meta = ['noarch', 'src'] 31​ meta = ['noarch', 'src']
28 32​
Show All 22 Lines
View Options

testing/test_bodhi_directive.py

1# -*- coding: utf-8 -*- 1​# -*- coding: utf-8 -*-
2# Copyright 2009-2014, Red Hat, Inc. 2​# Copyright 2009-2014, Red Hat, Inc.
3# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+> 3​# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
4# See the LICENSE file for more details on Licensing 4​# See the LICENSE file for more details on Licensing
5 5​
6'''Unit tests for libtaskotron/directives/bodhi_directive.py''' 6​'''Unit tests for libtaskotron/directives/bodhi_directive.py'''
7 7​
8import pytest 8​import pytest
9from dingus import Dingus 9​from dingus import Dingus
10 10​
11from libtaskotron.directives import bodhi_directive 11​from libtaskotron.directives import bodhi_directive
12from libtaskotron.exceptions import TaskotronDirectiveError 12​from libtaskotron.exceptions import TaskotronDirectiveError
13​from libtaskotron import arch_utils
13 14​
14class TestBodhiDownloads(): 15​class TestBodhiDownloads():
15 16​
16 def setup_method(self, method): 17​ def setup_method(self, method):
17 '''Run this before every test invocation''' 18​ '''Run this before every test invocation'''
18 self.ref_arch = ['x86_64'] 19​ self.ref_arch = ['x86_64']
19 self.ref_update_id = 'FEDORA-1234-56789' 20​ self.ref_update_id = 'FEDORA-1234-56789'
20 self.ref_workdir = '/var/tmp/foo' 21​ self.ref_workdir = '/var/tmp/foo'
▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Line(s)62 def test_action_download_all_archs(self):
68 69​
69 stub_bodhi = Dingus(get_update__returns=self.ref_update) 70​ stub_bodhi = Dingus(get_update__returns=self.ref_update)
70 stub_koji = Dingus(get_nvr_rpms__returns=[self.ref_rpmfile]) 71​ stub_koji = Dingus(get_nvr_rpms__returns=[self.ref_rpmfile])
71 72​
72 test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji) 73​ test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji)
73 74​
74 test_bodhi.process(self.ref_input, self.ref_arg_data) 75​ test_bodhi.process(self.ref_input, self.ref_arg_data)
75 76​
76 ref_arches = set(['i386', 'x86_64', 'noarch', 'armhfp']) 77​ ref_arches = set(arch_utils.Arches.base + ['noarch'])
77 getrpms_calls = stub_koji.calls() 78​ getrpms_calls = stub_koji.calls()
78 req_arches = map(lambda x: x[1][2], getrpms_calls) 79​ req_arches = map(lambda x: x[1][2], getrpms_calls)
79 80​
80 # checks whether all get_nvr_rpms calls demanded all arches 81​ # checks whether all get_nvr_rpms calls demanded all arches
81 assert all(map(lambda x: set(x) == ref_arches, req_arches)) 82​ assert all(map(lambda x: set(x) == ref_arches, req_arches))
82 83​
83 def test_action_download_source(self): 84​ def test_action_download_source(self):
84 '''Test download of source packages''' 85​ '''Test download of source packages'''
▲ Show 20 Lines • Show All 113 Lines • Show Last 20 Lines