Skip to content

Commit 7787260

Browse files
javihernandezjavihernandez
authored
Merge pull request AlmaLinux#1153 from javihernandez/bs-475
Move platform versions from modularity to data field
2 parents 636f41b + 06bd7e0 commit 7787260

File tree

6 files changed

+77
-74
lines changed

6 files changed

+77
-74
lines changed

‎alws/build_planner.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -525,21 +525,21 @@ async def _add_single_module(
525525
else:
526526
mock_options = {'definitions': {}}
527527
for platform in self._platforms:
528-
modularity_version = platform.modularity['versions'][-1]
528+
modularity_version = platform.data['versions'][-1]
529529
for flavour in self._platform_flavors:
530-
if flavour.modularity and flavour.modularity.get('versions'):
531-
modularity_version = flavour.modularity['versions'][-1]
530+
if flavour.data and flavour.data.get('versions'):
531+
modularity_version = flavour.data['versions'][-1]
532532
if task.module_platform_version:
533533
flavour_versions = [
534-
flavour.modularity['versions']
534+
flavour.data['versions']
535535
for flavour in self._platform_flavors
536-
if flavour.modularity
537-
and flavour.modularity.get('versions')
536+
if flavour.data
537+
and flavour.data.get('versions')
538538
]
539539
modularity_version = next(
540540
item
541541
for item in itertools.chain(
542-
platform.modularity['versions'], *flavour_versions
542+
platform.data['versions'], *flavour_versions
543543
)
544544
if item['name'] == task.module_platform_version
545545
)

‎alws/crud/errata.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1364,7 +1364,7 @@ async def release_errata_packages(
13641364
return
13651365
repo_stage = repo["name"].split("-")[-2]
13661366
arch = repo["name"].split("-")[-1]
1367-
platform_version = platform.modularity["versions"][-1]
1367+
platform_version = platform.data["versions"][-1]
13681368
platform_version = platform_version["name"].replace(".", "_")
13691369
rpm_module = None
13701370
reboot_suggested = False

‎reference_data/centos_stream.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
distr_version: '8'
55
priority: 2
66
test_dist_name: CentOSStream8
7-
modularity:
7+
modularity: {}
8+
data:
89
versions:
9-
data: {}
1010
is_reference: true
1111
type: rpm
1212
arch_list:
@@ -19,9 +19,9 @@
1919
distr_version: '9'
2020
priority: 2
2121
test_dist_name: CentOSStream9
22-
modularity:
22+
modularity: {}
23+
data:
2324
versions:
24-
data: {}
2525
is_reference: true
2626
type: rpm
2727
arch_list:
@@ -35,9 +35,9 @@
3535
distr_version: '10'
3636
priority: 2
3737
test_dist_name: CentOSStream10
38-
modularity:
38+
modularity: {}
39+
data:
3940
versions:
40-
data: {}
4141
is_reference: true
4242
type: rpm
4343
arch_list:

‎reference_data/platform_flavors.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
git_tag_prefix:
44
modified: a8
55
non_modified: c8
6+
data:
7+
mock:
8+
secure_boot_macros:
9+
"%pe_signing_cert": "'05'"
10+
"%pe_signing_token": "'AlmaLinux OS Foundation'"
611
versions:
712
- name: '8.10'
813
version_prefix: '81000'
914
dist_prefix: 'el8.10.0'
10-
data:
11-
mock:
12-
secure_boot_macros:
13-
"%pe_signing_cert": "'05'"
14-
"%pe_signing_token": "'AlmaLinux OS Foundation'"
1515
repositories:
1616
- name: almalinux-8-beta
1717
arch: i686
@@ -96,15 +96,15 @@
9696
git_tag_prefix:
9797
modified: a9
9898
non_modified: c9
99+
data:
100+
mock:
101+
secure_boot_macros:
102+
"%pe_signing_cert": '06'
103+
"%pe_signing_token": 'AlmaLinux OS Foundation'
99104
versions:
100105
- name: '9.6'
101106
version_prefix: '90600'
102107
dist_prefix: 'el9.6.0'
103-
data:
104-
mock:
105-
secure_boot_macros:
106-
"%pe_signing_cert": '06'
107-
"%pe_signing_token": 'AlmaLinux OS Foundation'
108108
repositories:
109109
- name: almalinux-9-beta
110110
arch: i686

‎reference_data/platforms.yaml‎

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,6 @@
1414
git_tag_prefix:
1515
modified: a8
1616
non_modified: c8
17-
versions:
18-
- name: '8.4'
19-
version_prefix: '80400'
20-
dist_prefix: 'el8.4.0'
21-
- name: '8.5'
22-
version_prefix: '80500'
23-
dist_prefix: 'el8.5.0'
24-
- name: '8.6'
25-
version_prefix: '80600'
26-
dist_prefix: 'el8.6.0'
27-
- name: '8.7'
28-
version_prefix: '80700'
29-
dist_prefix: 'el8.7.0'
30-
- name: '8.8'
31-
version_prefix: '80800'
32-
dist_prefix: 'el8.8.0'
33-
- name: '8.9'
34-
version_prefix: '80900'
35-
dist_prefix: 'el8.9.0'
36-
- name: '8.10'
37-
version_prefix: '81000'
38-
dist_prefix: 'el8.10.0'
3917
type: rpm
4018
arch_list:
4119
- i686
@@ -86,6 +64,28 @@
8664
"%modsign_os": "almalinux8"
8765
mock_dist: el8
8866
timeout: 43200
67+
versions:
68+
- name: '8.4'
69+
version_prefix: '80400'
70+
dist_prefix: 'el8.4.0'
71+
- name: '8.5'
72+
version_prefix: '80500'
73+
dist_prefix: 'el8.5.0'
74+
- name: '8.6'
75+
version_prefix: '80600'
76+
dist_prefix: 'el8.6.0'
77+
- name: '8.7'
78+
version_prefix: '80700'
79+
dist_prefix: 'el8.7.0'
80+
- name: '8.8'
81+
version_prefix: '80800'
82+
dist_prefix: 'el8.8.0'
83+
- name: '8.9'
84+
version_prefix: '80900'
85+
dist_prefix: 'el8.9.0'
86+
- name: '8.10'
87+
version_prefix: '81000'
88+
dist_prefix: 'el8.10.0'
8989
yum:
9090
best: false
9191
module_platform_id: platform:el8
@@ -1724,28 +1724,6 @@
17241724
git_tag_prefix:
17251725
modified: a9
17261726
non_modified: c9
1727-
versions:
1728-
- name: '9'
1729-
version_prefix: '90000'
1730-
dist_prefix: 'el9.0.0'
1731-
- name: '9.1'
1732-
version_prefix: '90100'
1733-
dist_prefix: 'el9.1.0'
1734-
- name: '9.2'
1735-
version_prefix: '90200'
1736-
dist_prefix: 'el9.2.0'
1737-
- name: '9.3'
1738-
version_prefix: '90300'
1739-
dist_prefix: 'el9.3.0'
1740-
- name: '9.4'
1741-
version_prefix: '90400'
1742-
dist_prefix: 'el9.4.0'
1743-
- name: '9.5'
1744-
version_prefix: '90500'
1745-
dist_prefix: 'el9.5.0'
1746-
- name: '9.6'
1747-
version_prefix: '90600'
1748-
dist_prefix: 'el9.6.0'
17491727
type: rpm
17501728
arch_list:
17511729
- i686
@@ -1789,6 +1767,28 @@
17891767
"%modsign_os": "almalinux9"
17901768
mock_dist: el9
17911769
timeout: 43200
1770+
versions:
1771+
- name: '9'
1772+
version_prefix: '90000'
1773+
dist_prefix: 'el9.0.0'
1774+
- name: '9.1'
1775+
version_prefix: '90100'
1776+
dist_prefix: 'el9.1.0'
1777+
- name: '9.2'
1778+
version_prefix: '90200'
1779+
dist_prefix: 'el9.2.0'
1780+
- name: '9.3'
1781+
version_prefix: '90300'
1782+
dist_prefix: 'el9.3.0'
1783+
- name: '9.4'
1784+
version_prefix: '90400'
1785+
dist_prefix: 'el9.4.0'
1786+
- name: '9.5'
1787+
version_prefix: '90500'
1788+
dist_prefix: 'el9.5.0'
1789+
- name: '9.6'
1790+
version_prefix: '90600'
1791+
dist_prefix: 'el9.6.0'
17921792
yum:
17931793
best: true
17941794
module_platform_id: platform:el9
@@ -3435,6 +3435,8 @@
34353435
"%modsign_os": "almalinux10"
34363436
mock_dist: el10
34373437
timeout: 43200
3438+
versions:
3439+
- name: '10.0'
34383440
yum:
34393441
best: true
34403442
module_platform_id: platform:el10

‎scripts/exporters/packages_exporter.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ def process_osv_data(
180180
osv_distr_mapping = {
181181
"AlmaLinux-8": "AlmaLinux:8",
182182
"AlmaLinux-9": "AlmaLinux:9",
183+
"AlmaLinux-10": "AlmaLinux:10",
183184
}
184185
self.logger.debug("Generating OSV data")
185186
osv_target_dir = os.path.join(
@@ -575,7 +576,6 @@ def export_errata_and_oval(
575576
def extract_errata_from_exported_paths(
576577
exporter: PackagesExporter,
577578
exported_paths: List[str],
578-
platform_regex: re.Pattern,
579579
) -> dict:
580580
platform_errata_cache = {}
581581
with ThreadPoolExecutor(max_workers=4) as executor:
@@ -593,9 +593,12 @@ def extract_errata_from_exported_paths(
593593
"Extracted errata records from %s",
594594
repo_path,
595595
)
596-
platform = "AlmaLinux-8"
597-
if platform_regex.search(repo_path):
598-
platform = "AlmaLinux-9"
596+
repo_match = re.search(r"/(almalinux|vault)/(\d+)/", repo_path)
597+
if repo_match:
598+
version = repo_match.group(2)
599+
platform = f"AlmaLinux-{version}"
600+
else:
601+
platform = "AlmaLinux-8"
599602
if platform not in platform_errata_cache:
600603
platform_errata_cache[platform] = {
601604
"cache": [],
@@ -678,11 +681,9 @@ def main():
678681
repo_path,
679682
)
680683

681-
platform_regex = re.compile(r"\/(almalinux|vault)\/9\/")
682684
platform_errata_cache = extract_errata_from_exported_paths(
683685
exporter=exporter,
684686
exported_paths=exported_paths,
685-
platform_regex=platform_regex,
686687
)
687688

688689
sync(

0 commit comments

Comments
 (0)