Skip to content

Commit b2c1ff3

Browse files
wtripp180901wtripp180901
committed
Merge branch 'main' into fix/lustre-extrabuild
2 parents 720073e + fd6eb4f commit b2c1ff3

File tree

14 files changed

+72
-23
lines changed

14 files changed

+72
-23
lines changed

‎.github/workflows/fatimage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ 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
29-
source_image_name: Rocky-9-GenericCloud-Base-9.4-20240523.0.x86_64.qcow2
29+
source_image_name: Rocky-9-GenericCloud-Base-9.5-20241118.0.x86_64.qcow2
3030
inventory_groups: control,compute,login,update
3131
env:
3232
ANSIBLE_FORCE_COLOR: True

‎.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

‎.github/workflows/trivyscan.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,20 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@v2
2727

28+
- name: Override CI_CLOUD if PR label is present
29+
if: ${{ github.event_name == 'pull_request' }}
30+
run: |
31+
# Iterate over the labels
32+
labels=$(echo '${{ toJSON(github.event.pull_request.labels) }}' | jq -r '.[].name')
33+
echo $labels
34+
for label in $labels; do
35+
if [[ $label == CI_CLOUD=* ]]; then
36+
# Extract the value after 'CI_CLOUD='
37+
CI_CLOUD_OVERRIDE=${label#CI_CLOUD=}
38+
echo "CI_CLOUD=${CI_CLOUD_OVERRIDE}" >> $GITHUB_ENV
39+
fi
40+
done
41+
2842
- name: Record settings for CI cloud
2943
run: |
3044
echo CI_CLOUD: ${{ env.CI_CLOUD }}

‎ansible/adhoc/sync-pulp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
vars:
77
pulp_site_target_arch: "x86_64"
88
pulp_site_target_distribution: "rocky"
9-
pulp_site_target_distribution_version: "9.4"
9+
pulp_site_target_distribution_version: "9.5"
1010
pulp_site_target_distribution_version_major: "9"

‎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

‎ansible/roles/podman/tasks/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
# Type Path Mode User Group Age Argument
5656
R! /tmp/containers-user-*
5757
R! /tmp/podman-run-*
58+
R! /tmp/storage-run-*
5859
dest: /etc/tmpfiles.d/podman-local.conf
5960
owner: root
6061
group: root

‎docs/experimental/pulp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ An existing Pulp server can be used to host Ark repos by overriding `pulp_site_p
1414

1515
## Syncing Pulp content with Ark
1616

17-
If the `pulp` group is added to the Packer build groups, the local Pulp server will be synced with Ark on build. You must authenticate with Ark by overriding `pulp_site_upstream_username` and `pulp_site_upstream_password` with your vault encrypted Ark dev credentials. `dnf_repos_username` and `dnf_repos_password` must remain unset to access content from the local Pulp. Content can also be synced by running `ansible/adhoc/sync-pulp.yml`. By default this syncs repositories for Rocky 9.4 with x86_64 architecture, but can be overriden by setting extravars for `pulp_site_target_arch`, `pulp_site_target_distribution`, `pulp_site_target_distribution_version` and `pulp_site_target_distribution_version_major`.
17+
If the `pulp` group is added to the Packer build groups, the local Pulp server will be synced with Ark on build. You must authenticate with Ark by overriding `pulp_site_upstream_username` and `pulp_site_upstream_password` with your vault encrypted Ark dev credentials. `dnf_repos_username` and `dnf_repos_password` must remain unset to access content from the local Pulp. Content can also be synced by running `ansible/adhoc/sync-pulp.yml`. By default this syncs repositories for Rocky 9.5 with x86_64 architecture, but can be overriden by setting extravars for `pulp_site_target_arch`, `pulp_site_target_distribution`, `pulp_site_target_distribution_version` and `pulp_site_target_distribution_version_major`.

‎environments/.stackhpc/terraform/cluster_image.auto.tfvars.json

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-1138-77cfc703",
4+
"RL9": "openhpc-RL9-250102-1139-77cfc703"
55
}
66
}

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

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,46 @@ appliances_pulp_repos:
108108
'9.4':
109109
timestamp: 20241115T011711
110110
path: rocky/9.4/BaseOS/x86_64/os
111+
'9.5':
112+
timestamp: 20241216T013503
113+
path: rocky/9.5/BaseOS/x86_64/os
114+
'8.10':
115+
timestamp: 20241217T123729
116+
path: rocky/8.10/BaseOS/x86_64/os
111117
appstream:
112118
'9.4':
113119
timestamp: 20241112T003151
114120
path: rocky/9.4/AppStream/x86_64/os
121+
'9.5':
122+
timestamp: 20241217T005008
123+
path: rocky/9.5/AppStream/x86_64/os
124+
'8.10':
125+
timestamp: 20241217T123729
126+
path: rocky/8.10/AppStream/x86_64/os
115127
crb:
116128
'9.4':
117129
timestamp: 20241115T003133
118130
path: rocky/9.4/CRB/x86_64/os
131+
'9.5':
132+
timestamp: 20241217T005008
133+
path: rocky/9.5/CRB/x86_64/os
134+
'8.10':
135+
timestamp: 20241217T123729
136+
path: rocky/8.10/PowerTools/x86_64/os
119137
extras:
120138
'9.4':
121139
timestamp: 20241118T002802
122140
path: rocky/9.4/extras/x86_64/os
141+
'9.5':
142+
timestamp: 20241218T004632
143+
path: rocky/9.5/extras/x86_64/os
144+
'8.10':
145+
timestamp: 20241217T123729
146+
path: rocky/8.10/extras/x86_64/os
123147
epel:
124148
'9':
125149
timestamp: 20241213T010218
126-
path: epel/9/Everything/x86_64
150+
path: epel/9/Everything/x86_64
151+
'8':
152+
timestamp: 20241216T235733
153+
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": []

‎requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ roles:
2525

2626
collections:
2727
- name: containers.podman
28-
version: 1.10.2
28+
version: 1.16.2
2929
- name: community.grafana
3030
version: 1.5.4
3131
- name: https://github.com/stackhpc/ansible_collection_slurm_openstack_tools

0 commit comments

Comments
 (0)