Skip to content
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
3e80268
set up rocky-latest-test builds and ci
bertiethorpe Nov 25, 2024
151746c
bump images
bertiethorpe Nov 25, 2024
9c3301c
CI_CLOUD PR label override for trivy scan
bertiethorpe Nov 25, 2024
b2b2160
bump images
bertiethorpe Nov 25, 2024
0da074b
bump containers.podman collection version
bertiethorpe Nov 25, 2024
5ae1888
bump images
bertiethorpe Nov 25, 2024
b4d2d19
debug site.yml
bertiethorpe Nov 26, 2024
88e23de
mysql latest
bertiethorpe Nov 26, 2024
6671d69
bump mysql
bertiethorpe Nov 26, 2024
6a8266c
clear podman temp files on startup
bertiethorpe Nov 27, 2024
33ffa65
bump new images
bertiethorpe Nov 27, 2024
f4c5cfe
stop using rocky-latest-test images in CI
bertiethorpe Nov 28, 2024
d7a8dd2
low verbosity CI site.yml
bertiethorpe Nov 28, 2024
9065bb6
bumped repo timestamps to latest
wtripp180901 Dec 13, 2024
cc81aef
bump
wtripp180901 Dec 13, 2024
75961b4
Merge branch 'feat/pulp-builds' into update/latest-timestamps
wtripp180901 Dec 13, 2024
4b0e36d
now performs update in fatimage
wtripp180901 Dec 17, 2024
eeb8838
merge conflicts
wtripp180901 Dec 17, 2024
47b7bb3
bump
wtripp180901 Dec 17, 2024
5effb3f
Merge branch 'main' into update/latest-timestamps
wtripp180901 Dec 18, 2024
8a754d0
merging 9.5 podman fixes
wtripp180901 Dec 18, 2024
ee4ab93
bump
wtripp180901 Dec 18, 2024
5438150
added 9.5 ark snapshots + bumped genericcloud
wtripp180901 Dec 18, 2024
e7c96ad
bump
wtripp180901 Dec 18, 2024
6140caa
Merge branch 'update/latest-timestamps' into feat/rocky-9.5-release-t…
wtripp180901 Dec 18, 2024
484c54a
integrated refactor
wtripp180901 Dec 20, 2024
84aacac
merge conflicts
wtripp180901 Jan 2, 2025
77cfc70
merge with rocky 8 support
wtripp180901 Jan 2, 2025
5fddb85
bump
wtripp180901 Jan 2, 2025
9c4d576
Merge branch 'feat/rocky8-release-train' into feat/rocky-9.5-release-…
wtripp180901 Jan 2, 2025
3327898
Merge branch 'main' into feat/rocky-9.5-release-train
wtripp180901 Jan 2, 2025
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 @@ -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