Skip to content

Commit 1b94cfc

Browse files
authored
Merge pull request #501 from stackhpc/feat/rocky8-release-train
Release train support for Rocky 8.10
2 parents a769015 + 36ca0d5 commit 1b94cfc

File tree

9 files changed

+41
-19
lines changed

9 files changed

+41
-19
lines changed

.github/workflows/fatimage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
matrix: # build RL8, RL9
2424
build:
2525
- image_name: openhpc-RL8
26-
source_image_name: Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2
26+
source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.qcow2
2727
inventory_groups: control,compute,login,update
2828
- image_name: openhpc-RL9
2929
source_image_name: Rocky-9-GenericCloud-Base-9.4-20240523.0.x86_64.qcow2

.github/workflows/nightlybuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
matrix: # build RL8, RL9
2626
build:
2727
- image_name: rocky-latest-RL8
28-
source_image_name: Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2
28+
source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.qcow2
2929
inventory_groups: update
3030
- image_name: rocky-latest-RL9
3131
source_image_name: Rocky-9-GenericCloud-Base-9.4-20240523.0.x86_64.qcow2

ansible/bootstrap.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
ansible.builtin.include_role:
123123
name: dnf_repos
124124
tasks_from: set_repos.yml
125-
when: ansible_distribution_major_version == "9" #TODO update role once RL8 config decided
126125

127126
# --- tasks after here require access to package repos ---
128127
- hosts: squid

ansible/disable-repos.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
ansible.builtin.include_role:
66
name: dnf_repos
77
tasks_from: disable_repos.yml
8-
when: ansible_distribution_major_version == "9" #TODO update role once RL8 config decided

ansible/roles/dnf_repos/defaults/main.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,32 @@ dnf_repos_pulp_content_url: "{{ appliances_pulp_url }}/pulp/content"
22
dnf_repos_username: "{{ omit }}"
33
dnf_repos_password: "{{ omit }}"
44

5+
dnf_repos_filenames:
6+
'8':
7+
baseos: 'Rocky-BaseOS'
8+
appstream: 'Rocky-AppStream'
9+
crb: 'Rocky-PowerTools'
10+
extras: 'Rocky-Extras'
11+
'9':
12+
baseos: 'rocky'
13+
appstream: 'rocky'
14+
crb: 'rocky'
15+
extras: 'rocky-extras'
16+
17+
dnf_repos_version_filenames: "{{ dnf_repos_filenames[ansible_distribution_major_version] }}"
18+
519
# epel installed separately
620
dnf_repos_repolist:
7-
- file: rocky
21+
- file: "{{ dnf_repos_version_filenames.baseos }}"
822
name: baseos
923
base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.baseos[ansible_distribution_version] | appliances_repo_to_subpath }}"
10-
- file: rocky
24+
- file: "{{ dnf_repos_version_filenames.appstream }}"
1125
name: appstream
1226
base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.appstream[ansible_distribution_version] | appliances_repo_to_subpath }}"
13-
- file: rocky
14-
name: crb
27+
- file: "{{ dnf_repos_version_filenames.crb }}"
28+
name: "{{ 'powertools' if ansible_distribution_major_version == '8' else 'crb' }}"
1529
base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.crb[ansible_distribution_version] | appliances_repo_to_subpath }}"
16-
- file: rocky-extras
30+
- file: "{{ dnf_repos_version_filenames.extras }}"
1731
name: extras
1832
base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.extras[ansible_distribution_version] | appliances_repo_to_subpath }}"
1933

ansible/roles/dnf_repos/tasks/set_repos.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
description: "{{ item.name }}"
99
username: "{{ dnf_repos_username }}"
1010
password: "{{ dnf_repos_password }}"
11+
gpgcheck: false
1112
loop: "{{ dnf_repos_repolist }}"
1213

1314
- name: Install epel-release
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"cluster_image": {
3-
"RL8": "openhpc-RL8-241220-1131-a2dde143",
4-
"RL9": "openhpc-RL9-241220-1131-a2dde143"
3+
"RL8": "openhpc-RL8-250102-1135-8c98e169",
4+
"RL9": "openhpc-RL9-250102-1135-8c98e169"
55
}
66
}

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,34 @@ appliances_pulp_repos:
108108
'9.4':
109109
timestamp: 20241115T011711
110110
path: rocky/9.4/BaseOS/x86_64/os
111+
'8.10':
112+
timestamp: 20241217T123729
113+
path: rocky/8.10/BaseOS/x86_64/os
111114
appstream:
112115
'9.4':
113116
timestamp: 20241112T003151
114117
path: rocky/9.4/AppStream/x86_64/os
118+
'8.10':
119+
timestamp: 20241217T123729
120+
path: rocky/8.10/AppStream/x86_64/os
115121
crb:
116122
'9.4':
117123
timestamp: 20241115T003133
118124
path: rocky/9.4/CRB/x86_64/os
125+
'8.10':
126+
timestamp: 20241217T123729
127+
path: rocky/8.10/PowerTools/x86_64/os
119128
extras:
120129
'9.4':
121130
timestamp: 20241118T002802
122131
path: rocky/9.4/extras/x86_64/os
132+
'8.10':
133+
timestamp: 20241217T123729
134+
path: rocky/8.10/extras/x86_64/os
123135
epel:
124136
'9':
125137
timestamp: 20241213T010218
126-
path: epel/9/Everything/x86_64
138+
path: epel/9/Everything/x86_64
139+
'8':
140+
timestamp: 20241216T235733
141+
path: epel/8/Everything/x86_64

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,4 @@ openhpc_state_save_location: "{{ appliances_state_dir + '/slurmctld' if applianc
4141

4242
ohpc_default_extra_repos:
4343
"9": [] #overriding to ensure doesn't overwrite ark epel repo
44-
"8":
45-
- name: epel
46-
file: epel
47-
description: "Extra Packages for Enterprise Linux 8 - $basearch"
48-
metalink: "https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch&infra=$infra&content=$contentdir"
49-
gpgcheck: true
50-
gpgkey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8"
44+
"8": []

0 commit comments

Comments
 (0)