Skip to content

Commit fd6eb4f

Browse files
authored
Merge pull request #503 from stackhpc/feat/rocky-9.5-release-train
Bump appliance to Rocky 9.5 + release train support
2 parents 1b94cfc + 3327898 commit fd6eb4f

File tree

8 files changed

+33
-6
lines changed

8 files changed

+33
-6
lines changed

.github/workflows/fatimage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
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/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/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`.
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-250102-1135-8c98e169",
4-
"RL9": "openhpc-RL9-250102-1135-8c98e169"
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: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,27 +108,39 @@ 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
111114
'8.10':
112115
timestamp: 20241217T123729
113116
path: rocky/8.10/BaseOS/x86_64/os
114117
appstream:
115118
'9.4':
116119
timestamp: 20241112T003151
117120
path: rocky/9.4/AppStream/x86_64/os
121+
'9.5':
122+
timestamp: 20241217T005008
123+
path: rocky/9.5/AppStream/x86_64/os
118124
'8.10':
119125
timestamp: 20241217T123729
120126
path: rocky/8.10/AppStream/x86_64/os
121127
crb:
122128
'9.4':
123129
timestamp: 20241115T003133
124130
path: rocky/9.4/CRB/x86_64/os
131+
'9.5':
132+
timestamp: 20241217T005008
133+
path: rocky/9.5/CRB/x86_64/os
125134
'8.10':
126135
timestamp: 20241217T123729
127136
path: rocky/8.10/PowerTools/x86_64/os
128137
extras:
129138
'9.4':
130139
timestamp: 20241118T002802
131140
path: rocky/9.4/extras/x86_64/os
141+
'9.5':
142+
timestamp: 20241218T004632
143+
path: rocky/9.5/extras/x86_64/os
132144
'8.10':
133145
timestamp: 20241217T123729
134146
path: rocky/8.10/extras/x86_64/os

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)