Skip to content

Commit 8f438b1

Browse files
committed
removed pulp_repo_name fields
1 parent c8635bb commit 8f438b1

File tree

2 files changed

+2
-27
lines changed

2 files changed

+2
-27
lines changed

ansible/roles/pulp_site/filter_plugins/pulp-list-filters.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def filters(self):
99

1010
def select_repos(self, dnf_repos, target_distro_ver): #TODO: why does baseos get a major and minor version?
1111
""" Filter dnf_repos to only those for a relevant distribution version (M.m or M). Returns a list of dicts.
12-
TODO: note this adds distro_ver as a key
12+
TODO: note this adds distro_ver and pulp_repo_name as a key
1313
"""
1414

1515
target_distro_ver_major = target_distro_ver.split('.')[0]
@@ -25,6 +25,7 @@ def select_repos(self, dnf_repos, target_distro_ver): #TODO: why does baseos get
2525
raise ValueError(f'No key matching {target_distro_ver_major} or {target_distro_ver} found in f{repokey}')
2626
repo_data = dnf_repos[repokey][selected_ver]
2727
repo_data['distro_ver'] = selected_ver
28+
repo_data['pulp_repo_name'] = repokey
2829
rpm_repos.append(repo_data)
2930
return rpm_repos
3031

environments/common/inventory/group_vars/all/timestamps.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,143 +3,117 @@ dnf_repos_default:
33
Ceph:
44
'8':
55
pulp_path: centos/8-stream/storage/x86_64/ceph-quincy
6-
pulp_repo_name: ceph
76
pulp_timestamp: 20231104T015751
87
repo_file: ceph
98
'9':
109
pulp_path: centos/9-stream/storage/x86_64/ceph-reef
11-
pulp_repo_name: ceph
1210
pulp_timestamp: 20250617T023108
1311
repo_file: ceph
1412
appstream:
1513
'8.10':
1614
pulp_path: rocky/8.10/AppStream/x86_64/os
17-
pulp_repo_name: appstream
1815
pulp_timestamp: 20250614T013846
1916
repo_file: Rocky-AppStream
2017
'9.4':
2118
pulp_path: rocky/9.4/AppStream/x86_64/os
22-
pulp_repo_name: appstream
2319
pulp_timestamp: 20241112T003151
2420
repo_file: rocky
2521
'9.5':
2622
pulp_path: rocky/9.5/AppStream/x86_64/os
27-
pulp_repo_name: appstream
2823
pulp_timestamp: 20250514T014704
2924
repo_file: rocky
3025
'9.6':
3126
pulp_path: rocky/9.6/AppStream/x86_64/os
32-
pulp_repo_name: appstream
3327
pulp_timestamp: 20250816T020215
3428
repo_file: rocky
3529
baseos:
3630
'8.10':
3731
pulp_path: rocky/8.10/BaseOS/x86_64/os
38-
pulp_repo_name: baseos
3932
pulp_timestamp: 20250614T013846
4033
repo_file: Rocky-BaseOS
4134
'9.4':
4235
pulp_path: rocky/9.4/BaseOS/x86_64/os
43-
pulp_repo_name: baseos
4436
pulp_timestamp: 20241115T011711
4537
repo_file: rocky
4638
'9.5':
4739
pulp_path: rocky/9.5/BaseOS/x86_64/os
48-
pulp_repo_name: baseos
4940
pulp_timestamp: 20250513T031844
5041
repo_file: rocky
5142
'9.6':
5243
pulp_path: rocky/9.6/BaseOS/x86_64/os
53-
pulp_repo_name: baseos
5444
pulp_timestamp: 20250815T050653
5545
repo_file: rocky
5646
crb:
5747
'8.10':
5848
pulp_path: rocky/8.10/PowerTools/x86_64/os
59-
pulp_repo_name: crb
6049
pulp_timestamp: 20250614T013846
6150
repo_file: Rocky-PowerTools
6251
repo_name: powertools
6352
'9.4':
6453
pulp_path: rocky/9.4/CRB/x86_64/os
65-
pulp_repo_name: crb
6654
pulp_timestamp: 20241115T003133
6755
repo_file: rocky
6856
'9.5':
6957
pulp_path: rocky/9.5/CRB/x86_64/os
70-
pulp_repo_name: crb
7158
pulp_timestamp: 20250514T014704
7259
repo_file: rocky
7360
'9.6':
7461
pulp_path: rocky/9.6/CRB/x86_64/os
75-
pulp_repo_name: crb
7662
pulp_timestamp: 20250815T034418
7763
repo_file: rocky
7864
extras:
7965
'8.10':
8066
pulp_path: rocky/8.10/extras/x86_64/os
81-
pulp_repo_name: extras
8267
pulp_timestamp: 20250510T032327
8368
repo_file: Rocky-Extras
8469
'9.4':
8570
pulp_path: rocky/9.4/extras/x86_64/os
86-
pulp_repo_name: extras
8771
pulp_timestamp: 20241118T002802
8872
repo_file: rocky-extras
8973
'9.5':
9074
pulp_path: rocky/9.5/extras/x86_64/os
91-
pulp_repo_name: extras
9275
pulp_timestamp: 20250506T032818
9376
repo_file: rocky-extras
9477
'9.6':
9578
pulp_path: rocky/9.6/extras/x86_64/os
96-
pulp_repo_name: extras
9779
pulp_timestamp: 20250726T040613
9880
repo_file: rocky-extras
9981
grafana:
10082
'8':
10183
pulp_path: grafana/oss/rpm
102-
pulp_repo_name: grafana
10384
pulp_timestamp: 20250730T011314
10485
repo_file: grafana
10586
timestamp: 20250615T005738
10687
'9':
10788
pulp_path: grafana/oss/rpm
108-
pulp_repo_name: grafana
10989
pulp_timestamp: 20250730T011314
11090
repo_file: grafana
11191
epel:
11292
epel:
11393
'8':
11494
pulp_path: epel/8/Everything/x86_64
115-
pulp_repo_name: epel
11695
pulp_timestamp: 20250615T234151
11796
repo_file: epel
11897
'9':
11998
pulp_path: epel/9/Everything/x86_64
120-
pulp_repo_name: epel
12199
pulp_timestamp: 20250817T000753
122100
repo_file: epel
123101
ohpc:
124102
OpenHPC:
125103
'8':
126104
pulp_path: OpenHPC/2/EL_8
127-
pulp_repo_name: ohpc
128105
pulp_timestamp: 20241218T154614
129106
repo_file: OpenHPC
130107
'9':
131108
pulp_path: OpenHPC/3/EL_9
132-
pulp_repo_name: ohpc
133109
pulp_timestamp: 20241218T154614
134110
repo_file: OpenHPC
135111
OpenHPC-updates:
136112
'8':
137113
pulp_path: OpenHPC/2/updates/EL_8
138-
pulp_repo_name: ohpc-updates
139114
pulp_timestamp: 20250512T003315
140115
repo_file: OpenHPC
141116
'9':
142117
pulp_path: OpenHPC/3/updates/EL_9
143-
pulp_repo_name: ohpc-updates
144118
pulp_timestamp: 20250510T003301
145119
repo_file: OpenHPC

0 commit comments

Comments
 (0)