Differential D1172

yumrepoinfo: specify all primary and alternate arches
ClosedPublic
Actions

Authored by kparal on Mar 17 2017, 5:13 PM.

Details

Reviewers
jskladan
Group Reviewers
libtaskotron
Commits
rLTRN15502f416d88: yumrepoinfo: specify all primary and alternate arches
Summary

There wasn't much point for 'arches' key before. Now it's more clearly
distinguished between primary and alternate arches, and all arches
currently available in Fedora are added (so that you can now request URL
for s390x and you'll get the right value).

Test Plan

Ran a simple task, seems to work.

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 created this revision.Mar 17 2017, 5:13 PM
jskladan accepted this revision.Mar 21 2017, 11:18 AM
This revision is now accepted and ready to land.Mar 21 2017, 11:18 AM
Closed by commit rLTRN15502f416d88: yumrepoinfo: specify all primary and alternate arches (authored by Kamil Páral <kparal@redhat.com>). · Explain WhyMar 21 2017, 11:45 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 2984

View Options

conf/yumrepoinfo.conf.example

Show All 11 Lines
12# random mirror every time. For faster and more reliable operation, pick a close 12​# random mirror every time. For faster and more reliable operation, pick a close
13# mirror from https://mirrors.fedoraproject.org and use it in 'baseurl' and 'baseurl_altarch'. 13​# mirror from https://mirrors.fedoraproject.org and use it in 'baseurl' and 'baseurl_altarch'.
14baseurl = http://download.fedoraproject.org/pub/fedora/linux 14​baseurl = http://download.fedoraproject.org/pub/fedora/linux
15baseurl_altarch = http://download.fedoraproject.org/pub/fedora-secondary 15​baseurl_altarch = http://download.fedoraproject.org/pub/fedora-secondary
16goldurl = %(baseurl)s/releases/%(path)s/Everything/%(arch)s/os 16​goldurl = %(baseurl)s/releases/%(path)s/Everything/%(arch)s/os
17updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s 17​updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s
18rawhideurl = %(baseurl)s/%(path)s/Everything/%(arch)s/os 18​rawhideurl = %(baseurl)s/%(path)s/Everything/%(arch)s/os
19 19​
20# list of supported architectures 20​# list of primary and alternate architectures. That decides whether baseurl or baseurl_altarch
21arches = armhfp, i386, x86_64 21​# is used when determining path.
22 22​primary_arches = armhfp, x86_64
23# we need to know which of them are alternate architectures. For those, baseurl_altarch is used 23​alternate_arches = aarch64, i386, ppc64, ppc64le, s390x
24# instead of baseurl. ​
25alternate_arches = i386 ​
26 24​
27# a direct parent of this repo, essential for operations (dependencies) 25​# a direct parent of this repo, essential for operations (dependencies)
28parent = 26​parent =
29 27​
30# koji tag defaults to section name 28​# koji tag defaults to section name
31tag = %(__name__)s 29​tag = %(__name__)s
32 30​
33# release_status can be one of: obsolete, stable, branched or rawhide 31​# release_status can be one of: obsolete, stable, branched or rawhide
Show All 23 Lines
57path = testing/26 55​path = testing/26
58parent = f26-updates 56​parent = f26-updates
59 57​
60# Fedora 25 58​# Fedora 25
61[f25] 59​[f25]
62url = %(goldurl)s 60​url = %(goldurl)s
63path = 25 61​path = 25
64release_status = stable 62​release_status = stable
65alternate_arches = 63​primary_arches = armhfp, i386, x86_64
64​alternate_arches = aarch64, ppc64, ppc64le, s390x
66 65​
67[f25-updates] 66​[f25-updates]
68url = %(updatesurl)s 67​url = %(updatesurl)s
69path = 25 68​path = 25
70parent = f25 69​parent = f25
71alternate_arches = 70​primary_arches = armhfp, i386, x86_64
71​alternate_arches = aarch64, ppc64, ppc64le, s390x
72 72​
73[f25-updates-testing] 73​[f25-updates-testing]
74url = %(updatesurl)s 74​url = %(updatesurl)s
75path = testing/25 75​path = testing/25
76parent = f25-updates 76​parent = f25-updates
77alternate_arches = 77​primary_arches = armhfp, i386, x86_64
78​alternate_arches = aarch64, ppc64, ppc64le, s390x
78 79​
79# Fedora 24 80​# Fedora 24
80[f24] 81​[f24]
81url = %(goldurl)s 82​url = %(goldurl)s
82path = 24 83​path = 24
83release_status = stable 84​release_status = stable
84alternate_arches = 85​primary_arches = armhfp, i386, x86_64
86​alternate_arches = aarch64, ppc64, ppc64le, s390x
85 87​
86[f24-updates] 88​[f24-updates]
87url = %(updatesurl)s 89​url = %(updatesurl)s
88path = 24 90​path = 24
89parent = f24 91​parent = f24
90alternate_arches = 92​primary_arches = armhfp, i386, x86_64
93​alternate_arches = aarch64, ppc64, ppc64le, s390x
91 94​
92[f24-updates-testing] 95​[f24-updates-testing]
93url = %(updatesurl)s 96​url = %(updatesurl)s
94path = testing/24 97​path = testing/24
95parent = f24-updates 98​parent = f24-updates
96alternate_arches = 99​primary_arches = armhfp, i386, x86_64
100​alternate_arches = aarch64, ppc64, ppc64le, s390x
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'], ​
19 'x86_64': ['x86_64'], ​
20 'armhfp': ['armhfp', 'armv7hl'], ​
21 'aarch64': ['aarch64'], 18​ 'aarch64': ['aarch64'],
19​ 'armhfp': ['armhfp', 'armv7hl'],
20​ 'i386': ['i386', 'i486', 'i586', 'i686'],
22 'ppc64': ['ppc64'], 21​ 'ppc64': ['ppc64'],
23 'ppc64le': ['ppc64le'], 22​ 'ppc64le': ['ppc64le'],
24 's390x': ['s390x'], 23​ 's390x': ['s390x'],
24​ 'x86_64': ['x86_64'],
25 } 25​ }
26 26​
27 #: base architectures 27​ #: base architectures
28 base = binary.keys() 28​ base = binary.keys()
29 29​
30 #: meta arches 30​ #: meta arches
31 meta = ['noarch', 'src'] 31​ meta = ['noarch', 'src']
32 32​
Show All 22 Lines
View Options

libtaskotron/ext/fedora/yumrepoinfo.py

Show First 20 Lines • Show All 109 Lines • ▼ Show 20 Line(s)106 def branched(self):
110 ''' 110​ '''
111 for r in self.repos(): 111​ for r in self.repos():
112 if self.get(r, 'release_status').lower() == 'branched': 112​ if self.get(r, 'release_status').lower() == 'branched':
113 return r 113​ return r
114 return None 114​ return None
115 115​
116 116​
117 def arches(self, reponame): 117​ def arches(self, reponame):
118 '''Get the list of all supported architectures for a repo 118​ '''Get a list of all supported (primary and alternate) architectures for a repo
119 119​
120 :param str reponame: repository name 120​ :param str reponame: repository name
121 ''' 121​ '''
122 return self._getlist(reponame, 'arches') 122​ return (self._getlist(reponame, 'primary_arches') +
123​ self._getlist(reponame, 'alternate_arches'))
123 124​
124 125​
125 def get(self, reponame, key): 126​ def get(self, reponame, key):
126 '''Get a specific key value from a repo 127​ '''Get a specific key value from a repo
127 128​
128 :param str reponame: repository name 129​ :param str reponame: repository name
129 :param str key: name of the key you want to retrieve from a repository 130​ :param str key: name of the key you want to retrieve from a repository
130 (section) 131​ (section)
▲ Show 20 Lines • Show All 123 Lines • Show Last 20 Lines
View Options

testing/functest_yumrepoinfo_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​
6import pytest 6​import pytest
7import StringIO 7​import StringIO
8from dingus import Dingus 8​from dingus import Dingus
9 9​
10from libtaskotron.directives import yumrepoinfo_directive 10​from libtaskotron.directives import yumrepoinfo_directive
11from libtaskotron.exceptions import TaskotronDirectiveError 11​from libtaskotron.exceptions import TaskotronDirectiveError
12 12​
13from libtaskotron.ext.fedora import yumrepoinfo 13​from libtaskotron.ext.fedora import yumrepoinfo
14 14​
15 15​from test_yumrepoinfo import TEST_CONF
16TEST_CONF = '''\ ​
17[DEFAULT] ​
18baseurl = http://download.fedoraproject.org/pub/fedora/linux ​
19goldurl = %(baseurl)s/releases/%(path)s/Everything/%(arch)s/os ​
20updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s ​
21rawhideurl = %(baseurl)s/%(path)s/%(arch)s/os ​
22arches = i386, x86_64 ​
23parent = ​
24tag = %(__name__)s ​
25supported = no ​
26 ​
27[rawhide] ​
28path = development/rawhide ​
29url = %(rawhideurl)s ​
30tag = f21 ​
31 ​
32[f20] ​
33url = %(goldurl)s ​
34path = 20 ​
35supported = yes ​
36 ​
37[f20-updates] ​
38url = %(updatesurl)s ​
39path = 20 ​
40parent = f20 ​
41arches = x86_64 ​
42 ​
43[f20-updates-testing] ​
44url = %(updatesurl)s ​
45path = testing/20 ​
46parent = f20-updates ​
47''' ​
48 16​
49 17​
50class TestYumrepoinfoDirective(object): 18​class TestYumrepoinfoDirective(object):
51 19​
52 @classmethod 20​ @classmethod
53 @pytest.fixture(autouse=True) 21​ @pytest.fixture(autouse=True)
54 def setup_class(cls, tmpdir): 22​ def setup_class(cls, tmpdir):
55 '''One-time class initialization''' 23​ '''One-time class initialization'''
▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 Line(s)
156 def test_multiple_base_arches(self): 124​ def test_multiple_base_arches(self):
157 directive = yumrepoinfo_directive.YumrepoinfoDirective(filelist=[self.temp_conf.strpath]) 125​ directive = yumrepoinfo_directive.YumrepoinfoDirective(filelist=[self.temp_conf.strpath])
158 ref_input = {"koji_tag": "f20", "arch": ["i386", "x86_64"]} 126​ ref_input = {"koji_tag": "f20", "arch": ["i386", "x86_64"]}
159 127​
160 output = directive.process(ref_input, None) 128​ output = directive.process(ref_input, None)
161 129​
162 assert output == { 130​ assert output == {
163 "f20": { 131​ "f20": {
164 "i386": "http://download.fedoraproject.org/pub/fedora/linux/releases/20/Everything/i386/os", 132​ "i386": "http://download.fedoraproject.org/pub/fedora-secondary/releases/20/"
165 "x86_64": "http://download.fedoraproject.org/pub/fedora/linux/releases/20/Everything/x86_64/os"} 133​ "Everything/i386/os",
134​ "x86_64": "http://download.fedoraproject.org/pub/fedora/linux/releases/20/"
135​ "Everything/x86_64/os"
166 } 136​ }
137​ }
167 138​
168 def test_multiple_base_meta_arches(self): 139​ def test_multiple_base_meta_arches(self):
169 directive = yumrepoinfo_directive.YumrepoinfoDirective(filelist=[self.temp_conf.strpath]) 140​ directive = yumrepoinfo_directive.YumrepoinfoDirective(filelist=[self.temp_conf.strpath])
170 ref_input = {"koji_tag": "f20", "arch": ["src", "i386", "x86_64"]} 141​ ref_input = {"koji_tag": "f20", "arch": ["src", "i386", "x86_64"]}
171 142​
172 output = directive.process(ref_input, None) 143​ output = directive.process(ref_input, None)
173 144​
174 assert output == { 145​ assert output == {
175 "f20": { 146​ "f20": {
176 "i386": "http://download.fedoraproject.org/pub/fedora/linux/releases/20/Everything/i386/os", 147​ "i386": "http://download.fedoraproject.org/pub/fedora-secondary/releases/20/"
177 "x86_64": "http://download.fedoraproject.org/pub/fedora/linux/releases/20/Everything/x86_64/os"} 148​ "Everything/i386/os",
149​ "x86_64": "http://download.fedoraproject.org/pub/fedora/linux/releases/20/"
150​ "Everything/x86_64/os"
178 } 151​ }
152​ }
View Options

testing/test_yumrepoinfo.py

Show All 14 Lines
15 15​
16TEST_CONF='''\ 16​TEST_CONF='''\
17[DEFAULT] 17​[DEFAULT]
18baseurl = http://download.fedoraproject.org/pub/fedora/linux 18​baseurl = http://download.fedoraproject.org/pub/fedora/linux
19baseurl_altarch = http://download.fedoraproject.org/pub/fedora-secondary 19​baseurl_altarch = http://download.fedoraproject.org/pub/fedora-secondary
20goldurl = %(baseurl)s/releases/%(path)s/Everything/%(arch)s/os 20​goldurl = %(baseurl)s/releases/%(path)s/Everything/%(arch)s/os
21updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s 21​updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s
22rawhideurl = %(baseurl)s/%(path)s/%(arch)s/os 22​rawhideurl = %(baseurl)s/%(path)s/%(arch)s/os
23arches = i386, x86_64 23​primary_arches = armhfp, x86_64
24alternate_arches = i386 24​alternate_arches = i386
25parent = 25​parent =
26tag = %(__name__)s 26​tag = %(__name__)s
27release_status = 27​release_status =
28 28​
29[rawhide] 29​[rawhide]
30path = development/rawhide 30​path = development/rawhide
31url = %(rawhideurl)s 31​url = %(rawhideurl)s
Show All 10 Lines
42url = %(goldurl)s 42​url = %(goldurl)s
43path = 20 43​path = 20
44release_status = STABLE 44​release_status = STABLE
45 45​
46[f20-updates] 46​[f20-updates]
47url = %(updatesurl)s 47​url = %(updatesurl)s
48path = 20 48​path = 20
49parent = f20 49​parent = f20
50arches = x86_64 50​primary_arches = x86_64
51 51​
52[f20-updates-testing] 52​[f20-updates-testing]
53url = %(updatesurl)s 53​url = %(updatesurl)s
54path = testing/20 54​path = testing/20
55parent = f20-updates 55​parent = f20-updates
56 56​
57[f15] 57​[f15]
58url = not_really_an_url 58​url = not_really_an_url
▲ Show 20 Lines • Show All 56 Lines • ▼ Show 20 Line(s)113 def test_releases(self):
115 assert self.repoinfo.releases() == ['f20'] 115​ assert self.repoinfo.releases() == ['f20']
116 116​
117 def test_branched(self): 117​ def test_branched(self):
118 '''branched() should return branched release repo name''' 118​ '''branched() should return branched release repo name'''
119 assert self.repoinfo.branched() == 'f21' 119​ assert self.repoinfo.branched() == 'f21'
120 120​
121 def test_arches(self): 121​ def test_arches(self):
122 '''arches() should return what's defined in a section''' 122​ '''arches() should return what's defined in a section'''
123 assert self.repoinfo.arches('f20') == ['i386', 'x86_64'] 123​ assert sorted(self.repoinfo.arches('DEFAULT')) == sorted(['i386', 'x86_64', 'armhfp'])
124 assert self.repoinfo.arches('DEFAULT') == ['i386', 'x86_64'] 124​ assert sorted(self.repoinfo.arches('rawhide')) == sorted(['i386', 'x86_64', 'armhfp'])
125 assert self.repoinfo.arches('f20-updates') == ['x86_64'] 125​ assert sorted(self.repoinfo.arches('f21')) == sorted(['x86_64', 'armhfp'])
126​ assert sorted(self.repoinfo.arches('f20-updates')) == sorted(['x86_64', 'i386'])
126 127​
127 def test_get(self): 128​ def test_get(self):
128 '''get() simply returns a key''' 129​ '''get() simply returns a key'''
129 assert self.repoinfo.get('rawhide', 'release_status') == 'rawhide' 130​ assert self.repoinfo.get('rawhide', 'release_status') == 'rawhide'
130 assert self.repoinfo.get('DEFAULT', 'parent') == '' 131​ assert self.repoinfo.get('DEFAULT', 'parent') == ''
131 132​
132 def test_get_raise(self): 133​ def test_get_raise(self):
133 '''get() should raise an error when the key doesn't exist''' 134​ '''get() should raise an error when the key doesn't exist'''
▲ Show 20 Lines • Show All 67 Lines • Show Last 20 Lines