Skip to content

Commit

Permalink
Merge pull request #503 from stackhpc/feat/rocky-9.5-release-train
Browse files Browse the repository at this point in the history
Bump appliance to Rocky 9.5 + release train support
  • Loading branch information
wtripp180901 authored Jan 2, 2025
2 parents 1b94cfc + 3327898 commit fd6eb4f
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/fatimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
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
source_image_name: Rocky-9-GenericCloud-Base-9.5-20241118.0.x86_64.qcow2
inventory_groups: control,compute,login,update
env:
ANSIBLE_FORCE_COLOR: True
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/trivyscan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,20 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Override CI_CLOUD if PR label is present
if: ${{ github.event_name == 'pull_request' }}
run: |
# Iterate over the labels
labels=$(echo '${{ toJSON(github.event.pull_request.labels) }}' | jq -r '.[].name')
echo $labels
for label in $labels; do
if [[ $label == CI_CLOUD=* ]]; then
# Extract the value after 'CI_CLOUD='
CI_CLOUD_OVERRIDE=${label#CI_CLOUD=}
echo "CI_CLOUD=${CI_CLOUD_OVERRIDE}" >> $GITHUB_ENV
fi
done
- name: Record settings for CI cloud
run: |
echo CI_CLOUD: ${{ env.CI_CLOUD }}
Expand Down
2 changes: 1 addition & 1 deletion ansible/adhoc/sync-pulp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
vars:
pulp_site_target_arch: "x86_64"
pulp_site_target_distribution: "rocky"
pulp_site_target_distribution_version: "9.4"
pulp_site_target_distribution_version: "9.5"
pulp_site_target_distribution_version_major: "9"
1 change: 1 addition & 0 deletions ansible/roles/podman/tasks/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
# Type Path Mode User Group Age Argument
R! /tmp/containers-user-*
R! /tmp/podman-run-*
R! /tmp/storage-run-*
dest: /etc/tmpfiles.d/podman-local.conf
owner: root
group: root
Expand Down
2 changes: 1 addition & 1 deletion docs/experimental/pulp.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ An existing Pulp server can be used to host Ark repos by overriding `pulp_site_p

## Syncing Pulp content with Ark

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`.
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`.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"cluster_image": {
"RL8": "openhpc-RL8-250102-1135-8c98e169",
"RL9": "openhpc-RL9-250102-1135-8c98e169"
"RL8": "openhpc-RL8-250102-1138-77cfc703",
"RL9": "openhpc-RL9-250102-1139-77cfc703"
}
}
12 changes: 12 additions & 0 deletions environments/common/inventory/group_vars/all/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,27 +108,39 @@ appliances_pulp_repos:
'9.4':
timestamp: 20241115T011711
path: rocky/9.4/BaseOS/x86_64/os
'9.5':
timestamp: 20241216T013503
path: rocky/9.5/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
'9.5':
timestamp: 20241217T005008
path: rocky/9.5/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
'9.5':
timestamp: 20241217T005008
path: rocky/9.5/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
'9.5':
timestamp: 20241218T004632
path: rocky/9.5/extras/x86_64/os
'8.10':
timestamp: 20241217T123729
path: rocky/8.10/extras/x86_64/os
Expand Down
2 changes: 1 addition & 1 deletion requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ roles:

collections:
- name: containers.podman
version: 1.10.2
version: 1.16.2
- name: community.grafana
version: 1.5.4
- name: https://github.com/stackhpc/ansible_collection_slurm_openstack_tools
Expand Down

0 comments on commit fd6eb4f

Please sign in to comment.