Skip to content

Commit c8635bb

Browse files
committed
updated timestamps script + bumped rocky 9 timestamps
1 parent 4854903 commit c8635bb

File tree

4 files changed

+104
-94
lines changed

4 files changed

+104
-94
lines changed

ansible/ci/update_timestamps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
tasks:
33
- name: Get latest timestamps from sources
44
latest_timestamps:
5-
repos_dict: "{{ appliances_pulp_repos }}"
5+
repos_dict: "{{ dnf_repos_default }}"
66
content_url: "https://ark.stackhpc.com/pulp/content"
77
register: _result
88

@@ -13,4 +13,4 @@
1313
backup: true
1414
vars:
1515
repo_template:
16-
appliances_pulp_repos: "{{ _result.timestamps }}"
16+
dnf_repos_default: "{{ _result.timestamps }}"

ansible/library/latest_timestamps.py

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,21 @@ def run_module():
5252
)
5353

5454
timestamps = dict(module.params['repos_dict'])
55-
for repo in timestamps:
56-
for version in timestamps[repo]:
55+
for index in timestamps:
56+
for repo in timestamps[index]:
57+
for version in timestamps[index][repo]:
5758

58-
html_txt = requests.get(
59-
url= module.params['content_url'] + '/' + timestamps[repo][version]['path']
60-
).text
61-
timestamp_link_list = BeautifulSoup(html_txt,features="html.parser").body.find('pre').find_all() # getting raw list of timestamps from html
62-
timestamp_link_list = map(lambda x: x.string,timestamp_link_list) # stripping xml tags
63-
latest_timestamp = list(timestamp_link_list)[-1][:-1] # last timestamp in list with trailing / removed
64-
timestamps[repo][version]['timestamp'] = latest_timestamp
59+
html_txt = requests.get(
60+
url= module.params['content_url'] + '/' + timestamps[index][repo][version]['pulp_path']
61+
).text
62+
timestamp_link_list = BeautifulSoup(html_txt,features="html.parser").body.find('pre').find_all() # getting raw list of timestamps from html
63+
timestamp_link_list = map(lambda x: x.string,timestamp_link_list) # stripping xml tags
64+
latest_timestamp = list(timestamp_link_list)[-1][:-1] # last timestamp in list with trailing / removed
65+
timestamps[index][repo][version]['pulp_timestamp'] = latest_timestamp
66+
# timestamps[index] = dict(sorted(timestamps[index]))
6567

66-
result['timestamps'] = dict(sorted(timestamps.items()))
68+
69+
result['timestamps'] = timestamps
6770

6871
module.exit_json(**result)
6972

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
dnf_repos_all: "{{ dnf_repos_no_epel | combine(dnf_repos_default_epel) }}" #see timestamps.yml
2+
dnf_repos_no_epel: |
3+
{{ dnf_repos_default['base']
4+
| combine(dnf_repos_default['ohpc'] if (openhpc_install_type | default('ohpc')) == 'ohpc' else {})
5+
| combine(dnf_repos_extra) }}
6+
dnf_repos_default_epel: "{{ dnf_repos_default['epel'] }}"
7+
dnf_repos_extra: {}
8+
# dnf_repos_default:
9+
# base: # top level keys for internal indexing only, see `dnf_repos_all` and `dnf_repos_no_epel`
10+
# appstream: # yum_repository:name
11+
# '8.10': # ansible_distribution_version or ansible_distribution_major_version
12+
# repo_file: Rocky-AppStream # yum_repository: file
13+
# # repo_name: # optional, override yum_repository:name
14+
# pulp_path: rocky/8.10/AppStream/x86_64/os
15+
# pulp_timestamp: 20250614T013846
16+
# # pulp_content_url: # optional, dnf_repos_pulp_content_url
17+
# pulp_repo_name: appstream # pulp repository name
Lines changed: 72 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,155 +1,145 @@
1-
dnf_repos_all: "{{ dnf_repos_no_epel | combine(dnf_repos_default_epel) }}"
2-
dnf_repos_no_epel: |
3-
{{ dnf_repos_default['base']
4-
| combine(dnf_repos_default['ohpc'] if (openhpc_install_type | default('ohpc')) == 'ohpc' else {})
5-
| combine(dnf_repos_extra) }}
6-
dnf_repos_default_epel: "{{ dnf_repos_default['epel'] }}"
7-
81
dnf_repos_default:
9-
base: # top level keys for internal indexing only, see ansible/roles/dnf_repos/defaults.yml
10-
appstream: # yum_repository:name
11-
'8.10': # ansible_distribution_version or ansible_distribution_major_version
12-
repo_file: Rocky-AppStream # yum_repository: file
13-
# repo_name: # optional, override yum_repository:name
2+
base:
3+
Ceph:
4+
'8':
5+
pulp_path: centos/8-stream/storage/x86_64/ceph-quincy
6+
pulp_repo_name: ceph
7+
pulp_timestamp: 20231104T015751
8+
repo_file: ceph
9+
'9':
10+
pulp_path: centos/9-stream/storage/x86_64/ceph-reef
11+
pulp_repo_name: ceph
12+
pulp_timestamp: 20250617T023108
13+
repo_file: ceph
14+
appstream:
15+
'8.10':
1416
pulp_path: rocky/8.10/AppStream/x86_64/os
17+
pulp_repo_name: appstream
1518
pulp_timestamp: 20250614T013846
16-
# pulp_content_url: # optional, dnf_repos_pulp_content_url
17-
pulp_repo_name: appstream # pulp repository name
19+
repo_file: Rocky-AppStream
1820
'9.4':
19-
repo_file: rocky
2021
pulp_path: rocky/9.4/AppStream/x86_64/os
21-
pulp_timestamp: 20241112T003151
2222
pulp_repo_name: appstream
23-
'9.5':
23+
pulp_timestamp: 20241112T003151
2424
repo_file: rocky
25+
'9.5':
2526
pulp_path: rocky/9.5/AppStream/x86_64/os
26-
pulp_timestamp: 20250514T014704
2727
pulp_repo_name: appstream
28-
'9.6':
28+
pulp_timestamp: 20250514T014704
2929
repo_file: rocky
30+
'9.6':
3031
pulp_path: rocky/9.6/AppStream/x86_64/os
31-
pulp_timestamp: 20250726T040613
3232
pulp_repo_name: appstream
33+
pulp_timestamp: 20250816T020215
34+
repo_file: rocky
3335
baseos:
3436
'8.10':
35-
repo_file: Rocky-BaseOS
3637
pulp_path: rocky/8.10/BaseOS/x86_64/os
37-
pulp_timestamp: 20250614T013846
3838
pulp_repo_name: baseos
39+
pulp_timestamp: 20250614T013846
40+
repo_file: Rocky-BaseOS
3941
'9.4':
40-
repo_file: rocky
4142
pulp_path: rocky/9.4/BaseOS/x86_64/os
42-
pulp_timestamp: 20241115T011711
4343
pulp_repo_name: baseos
44-
'9.5':
44+
pulp_timestamp: 20241115T011711
4545
repo_file: rocky
46+
'9.5':
4647
pulp_path: rocky/9.5/BaseOS/x86_64/os
47-
pulp_timestamp: 20250513T031844
4848
pulp_repo_name: baseos
49-
'9.6':
49+
pulp_timestamp: 20250513T031844
5050
repo_file: rocky
51+
'9.6':
5152
pulp_path: rocky/9.6/BaseOS/x86_64/os
52-
pulp_timestamp: 20250726T052250
5353
pulp_repo_name: baseos
54-
Ceph:
55-
'8':
56-
repo_file: ceph
57-
pulp_path: centos/8-stream/storage/x86_64/ceph-quincy
58-
pulp_timestamp: 20231104T015751
59-
pulp_repo_name: ceph
60-
'9':
61-
repo_file: ceph
62-
pulp_path: centos/9-stream/storage/x86_64/ceph-reef
63-
pulp_timestamp: 20250617T023108
64-
pulp_repo_name: ceph
54+
pulp_timestamp: 20250815T050653
55+
repo_file: rocky
6556
crb:
6657
'8.10':
67-
repo_name: powertools
68-
repo_file: Rocky-PowerTools
6958
pulp_path: rocky/8.10/PowerTools/x86_64/os
70-
pulp_timestamp: 20250614T013846
7159
pulp_repo_name: crb
60+
pulp_timestamp: 20250614T013846
61+
repo_file: Rocky-PowerTools
62+
repo_name: powertools
7263
'9.4':
73-
repo_file: rocky
7464
pulp_path: rocky/9.4/CRB/x86_64/os
75-
pulp_timestamp: 20241115T003133
7665
pulp_repo_name: crb
77-
'9.5':
66+
pulp_timestamp: 20241115T003133
7867
repo_file: rocky
68+
'9.5':
7969
pulp_path: rocky/9.5/CRB/x86_64/os
80-
pulp_timestamp: 20250514T014704
8170
pulp_repo_name: crb
82-
'9.6':
71+
pulp_timestamp: 20250514T014704
8372
repo_file: rocky
73+
'9.6':
8474
pulp_path: rocky/9.6/CRB/x86_64/os
85-
pulp_timestamp: 20250726T040613
8675
pulp_repo_name: crb
76+
pulp_timestamp: 20250815T034418
77+
repo_file: rocky
8778
extras:
8879
'8.10':
89-
repo_file: Rocky-Extras
9080
pulp_path: rocky/8.10/extras/x86_64/os
91-
pulp_timestamp: 20250510T032327
9281
pulp_repo_name: extras
82+
pulp_timestamp: 20250510T032327
83+
repo_file: Rocky-Extras
9384
'9.4':
94-
repo_file: rocky-extras
9585
pulp_path: rocky/9.4/extras/x86_64/os
96-
pulp_timestamp: 20241118T002802
9786
pulp_repo_name: extras
98-
'9.5':
87+
pulp_timestamp: 20241118T002802
9988
repo_file: rocky-extras
89+
'9.5':
10090
pulp_path: rocky/9.5/extras/x86_64/os
101-
pulp_timestamp: 20250506T032818
10291
pulp_repo_name: extras
103-
'9.6':
92+
pulp_timestamp: 20250506T032818
10493
repo_file: rocky-extras
94+
'9.6':
10595
pulp_path: rocky/9.6/extras/x86_64/os
106-
pulp_timestamp: 20250726T040613
10796
pulp_repo_name: extras
97+
pulp_timestamp: 20250726T040613
98+
repo_file: rocky-extras
10899
grafana:
109100
'8':
110-
repo_file: grafana
111101
pulp_path: grafana/oss/rpm
112-
timestamp: 20250615T005738
113102
pulp_repo_name: grafana
114-
'9':
103+
pulp_timestamp: 20250730T011314
115104
repo_file: grafana
105+
timestamp: 20250615T005738
106+
'9':
116107
pulp_path: grafana/oss/rpm
117-
pulp_timestamp: 20250730T011314
118108
pulp_repo_name: grafana
109+
pulp_timestamp: 20250730T011314
110+
repo_file: grafana
111+
epel:
112+
epel:
113+
'8':
114+
pulp_path: epel/8/Everything/x86_64
115+
pulp_repo_name: epel
116+
pulp_timestamp: 20250615T234151
117+
repo_file: epel
118+
'9':
119+
pulp_path: epel/9/Everything/x86_64
120+
pulp_repo_name: epel
121+
pulp_timestamp: 20250817T000753
122+
repo_file: epel
119123
ohpc:
120124
OpenHPC:
121125
'8':
122-
repo_file: OpenHPC
123126
pulp_path: OpenHPC/2/EL_8
124-
pulp_timestamp: 20241218T154614
125127
pulp_repo_name: ohpc
126-
'9':
128+
pulp_timestamp: 20241218T154614
127129
repo_file: OpenHPC
130+
'9':
128131
pulp_path: OpenHPC/3/EL_9
129-
pulp_timestamp: 20241218T154614
130132
pulp_repo_name: ohpc
133+
pulp_timestamp: 20241218T154614
134+
repo_file: OpenHPC
131135
OpenHPC-updates:
132136
'8':
133-
repo_file: OpenHPC
134137
pulp_path: OpenHPC/2/updates/EL_8
135-
pulp_timestamp: 20250512T003315
136138
pulp_repo_name: ohpc-updates
137-
'9':
139+
pulp_timestamp: 20250512T003315
138140
repo_file: OpenHPC
141+
'9':
139142
pulp_path: OpenHPC/3/updates/EL_9
140-
pulp_timestamp: 20250510T003301
141143
pulp_repo_name: ohpc-updates
142-
epel:
143-
epel:
144-
'8':
145-
repo_file: epel
146-
pulp_path: epel/8/Everything/x86_64
147-
pulp_timestamp: 20250615T234151
148-
pulp_repo_name: epel
149-
'9':
150-
repo_file: epel
151-
pulp_path: epel/9/Everything/x86_64
152-
pulp_timestamp: 20250729T235750
153-
pulp_repo_name: epel
154-
155-
dnf_repos_extra: {}
144+
pulp_timestamp: 20250510T003301
145+
repo_file: OpenHPC

0 commit comments

Comments
 (0)