Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release train support for Rocky 8.10 #501

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Release train support for Rocky 8.10 #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc36b78
testing enabling release train for 8.10
wtripp180901 Dec 17, 2024
a9e53ba
Temporarily (?) building from rocky 8 genericcloud + update in fatimage
wtripp180901 Dec 17, 2024
1faf4e5
stopped openhpc overwriting epel 8
wtripp180901 Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/fatimage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
matrix: # build RL8, RL9
build:
- image_name: openhpc-RL8
source_image_name: rocky-latest-RL8
inventory_groups: control,compute,login
source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.qcow2
inventory_groups: control,compute,login,update
- image_name: openhpc-RL9
source_image_name: rocky-latest-RL9
inventory_groups: control,compute,login
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightlybuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
matrix: # build RL8, RL9
build:
- image_name: rocky-latest-RL8
source_image_name: Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2
source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.qcow2
inventory_groups: update
- image_name: rocky-latest-RL9
source_image_name: Rocky-9-GenericCloud-Base-9.4-20240523.0.x86_64.qcow2
Expand Down
1 change: 0 additions & 1 deletion ansible/bootstrap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
ansible.builtin.include_role:
name: dnf_repos
tasks_from: set_repos.yml
when: ansible_distribution_major_version == "9" #TODO update role once RL8 config decided

# --- tasks after here require access to package repos ---
- hosts: squid
Expand Down
1 change: 0 additions & 1 deletion ansible/disable-repos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
ansible.builtin.include_role:
name: dnf_repos
tasks_from: disable_repos.yml
when: ansible_distribution_major_version == "9" #TODO update role once RL8 config decided
24 changes: 19 additions & 5 deletions ansible/roles/dnf_repos/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,32 @@ dnf_repos_epel_prefix: "epel/{{ ansible_distribution_major_version }}"
dnf_repos_username: "{{ omit }}"
dnf_repos_password: "{{ omit }}"

dnf_repos_filenames:
'8':
baseos: 'Rocky-BaseOS'
appstream: 'Rocky-AppStream'
crb: 'Rocky-PowerTools'
extras: 'Rocky-Extras'
'9':
baseos: 'rocky'
appstream: 'rocky'
crb: 'rocky'
extras: 'rocky-extras'

dnf_repos_version_filenames: "{{ dnf_repos_filenames[ansible_distribution_major_version] }}"

# epel installed separately
dnf_repos_repolist:
- file: rocky
- file: "{{ dnf_repos_version_filenames.baseos }}"
name: baseos
base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/BaseOS/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.baseos[ansible_distribution_version] }}"
- file: rocky
- file: "{{ dnf_repos_version_filenames.appstream }}"
name: appstream
base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/AppStream/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.appstream[ansible_distribution_version] }}"
- file: rocky
name: crb
- file: "{{ dnf_repos_version_filenames.crb }}"
name: "{{ 'powertools' if ansible_distribution_major_version == '8' else 'crb' }}"
base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/CRB/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.crb[ansible_distribution_version] }}"
- file: rocky-extras
- file: "{{ dnf_repos_version_filenames.extras }}"
name: extras
base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/extras/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.extras[ansible_distribution_version] }}"

Expand Down
5 changes: 5 additions & 0 deletions environments/common/inventory/group_vars/all/defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,16 @@ appliances_local_users: "{{ appliances_local_users_default + appliances_local_us
appliances_repo_timestamps:
baseos:
'9.4': 20240816T002610
'8.10': 20241217T123729
appstream:
'9.4': 20240816T002610
'8.10': 20241217T123729
crb:
'9.4': 20240816T002610
'8.10': 20241217T123729
extras:
'9.4': 20240816T002610
'8.10': 20241217T123729
epel:
'9': 20240902T080424
'8': 20241216T235733
8 changes: 1 addition & 7 deletions environments/common/inventory/group_vars/all/openhpc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,4 @@ openhpc_state_save_location: "{{ appliances_state_dir + '/slurmctld' if applianc

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