Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/fatimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
matrix: # build RL8, RL9
build:
- image_name: openhpc-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: control,compute,login,update
- image_name: openhpc-RL9
source_image_name: Rocky-9-GenericCloud-Base-9.4-20240523.0.x86_64.qcow2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightlybuild.yml
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,32 @@ dnf_repos_pulp_content_url: "{{ appliances_pulp_url }}/pulp/content"
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 }}/{{ appliances_pulp_repos.baseos[ansible_distribution_version] | appliances_repo_to_subpath }}"
- file: rocky
- file: "{{ dnf_repos_version_filenames.appstream }}"
name: appstream
base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.appstream[ansible_distribution_version] | appliances_repo_to_subpath }}"
- 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 }}/{{ appliances_pulp_repos.crb[ansible_distribution_version] | appliances_repo_to_subpath }}"
- file: rocky-extras
- file: "{{ dnf_repos_version_filenames.extras }}"
name: extras
base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.extras[ansible_distribution_version] | appliances_repo_to_subpath }}"

Expand Down
1 change: 1 addition & 0 deletions ansible/roles/dnf_repos/tasks/set_repos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
description: "{{ item.name }}"
username: "{{ dnf_repos_username }}"
password: "{{ dnf_repos_password }}"
gpgcheck: false
loop: "{{ dnf_repos_repolist }}"

- name: Install epel-release
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"cluster_image": {
"RL8": "openhpc-RL8-241220-1131-a2dde143",
"RL9": "openhpc-RL9-241220-1131-a2dde143"
"RL8": "openhpc-RL8-250102-1135-8c98e169",
"RL9": "openhpc-RL9-250102-1135-8c98e169"
}
}
17 changes: 16 additions & 1 deletion environments/common/inventory/group_vars/all/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,34 @@ appliances_pulp_repos:
'9.4':
timestamp: 20241115T011711
path: rocky/9.4/BaseOS/x86_64/os
'8.10':
timestamp: 20241217T123729
path: rocky/8.10/BaseOS/x86_64/os
appstream:
'9.4':
timestamp: 20241112T003151
path: rocky/9.4/AppStream/x86_64/os
'8.10':
timestamp: 20241217T123729
path: rocky/8.10/AppStream/x86_64/os
crb:
'9.4':
timestamp: 20241115T003133
path: rocky/9.4/CRB/x86_64/os
'8.10':
timestamp: 20241217T123729
path: rocky/8.10/PowerTools/x86_64/os
extras:
'9.4':
timestamp: 20241118T002802
path: rocky/9.4/extras/x86_64/os
'8.10':
timestamp: 20241217T123729
path: rocky/8.10/extras/x86_64/os
epel:
'9':
timestamp: 20241213T010218
path: epel/9/Everything/x86_64
path: epel/9/Everything/x86_64
'8':
timestamp: 20241216T235733
path: epel/8/Everything/x86_64
8 changes: 1 addition & 7 deletions environments/common/inventory/group_vars/all/openhpc.yml
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