From 599bf8d7229441304e8dcc836b797c2c8e9e8b97 Mon Sep 17 00:00:00 2001 From: wtripp180901 Date: Thu, 5 Jun 2025 16:46:46 +0100 Subject: [PATCH 1/8] updated fatimage and timestamps --- .github/workflows/fatimage.yml | 2 +- .../inventory/group_vars/all/timestamps.yml | 48 ++++++++++++------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml index 8b5eebfc8..0ec041054 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -31,7 +31,7 @@ jobs: source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.raw inventory_groups: control,compute,login,update - image_name: openhpc-RL9 - source_image_name: Rocky-9-GenericCloud-Base-9.5-20241118.0.x86_64.raw + source_image_name: Rocky-9-GenericCloud-Base-9.6-20250531.0.x86_64.qcow2 inventory_groups: control,compute,login,update env: ANSIBLE_FORCE_COLOR: True diff --git a/environments/common/inventory/group_vars/all/timestamps.yml b/environments/common/inventory/group_vars/all/timestamps.yml index 8d046437a..526fefab5 100644 --- a/environments/common/inventory/group_vars/all/timestamps.yml +++ b/environments/common/inventory/group_vars/all/timestamps.yml @@ -2,57 +2,76 @@ appliances_pulp_repos: appstream: '8.10': path: rocky/8.10/AppStream/x86_64/os - timestamp: 20250328T030013 + timestamp: 20250605T024943 '9.4': path: rocky/9.4/AppStream/x86_64/os timestamp: 20241112T003151 '9.5': path: rocky/9.5/AppStream/x86_64/os - timestamp: 20250328T031822 + timestamp: 20250514T014704 + '9.6': + path: rocky/9.6/AppStream/x86_64/os + timestamp: 20250605T150141 baseos: '8.10': path: rocky/8.10/BaseOS/x86_64/os - timestamp: 20250328T030013 + timestamp: 20250605T024943 '9.4': path: rocky/9.4/BaseOS/x86_64/os timestamp: 20241115T011711 '9.5': path: rocky/9.5/BaseOS/x86_64/os - timestamp: 20250326T030636 + timestamp: 20250513T031844 + '9.6': + path: rocky/9.6/BaseOS/x86_64/os + timestamp: 20250605T150141 ceph: '8': path: centos/8-stream/storage/x86_64/ceph-quincy timestamp: 20231104T015751 '9': path: centos/9-stream/storage/x86_64/ceph-reef - timestamp: 20240923T233036 + timestamp: 20250514T025809 crb: '8.10': path: rocky/8.10/PowerTools/x86_64/os - timestamp: 20250328T030013 + timestamp: 20250605T024943 '9.4': path: rocky/9.4/CRB/x86_64/os timestamp: 20241115T003133 '9.5': path: rocky/9.5/CRB/x86_64/os - timestamp: 20250325T031428 + timestamp: 20250514T014704 + '9.6': + path: rocky/9.6/CRB/x86_64/os + timestamp: 20250605T150141 epel: '8': path: epel/8/Everything/x86_64 - timestamp: 20250326T000103 + timestamp: 20250605T011732 '9': path: epel/9/Everything/x86_64 - timestamp: 20250326T000103 + timestamp: 20250605T011732 extras: '8.10': path: rocky/8.10/extras/x86_64/os - timestamp: 20250327T030422 + timestamp: 20250510T032327 '9.4': path: rocky/9.4/extras/x86_64/os timestamp: 20241118T002802 '9.5': path: rocky/9.5/extras/x86_64/os - timestamp: 20250328T031822 + timestamp: 20250506T032818 + '9.6': + path: rocky/9.6/extras/x86_64/os + timestamp: 20250605T150141 + grafana: + '8': + path: grafana/oss/rpm + timestamp: 20250604T005900 + '9': + path: grafana/oss/rpm + timestamp: 20250604T005900 openhpc_base: '8': path: OpenHPC/2/EL_8 @@ -67,10 +86,3 @@ appliances_pulp_repos: '9': path: OpenHPC/3/updates/EL_9 timestamp: 20250510T003301 - grafana: - '8': - path: grafana/oss/rpm - timestamp: 20250505T025259 - '9': - path: grafana/oss/rpm - timestamp: 20250505T025259 From 0badaaa675290e53d48ba20b9cee7700fb80d8d2 Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Fri, 6 Jun 2025 09:01:31 +0100 Subject: [PATCH 2/8] bump --- environments/.stackhpc/tofu/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json index 763165f62..a912e6375 100644 --- a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-250514-1502-5a923b2c", - "RL9": "openhpc-RL9-250514-1502-5a923b2c" + "RL8": "openhpc-RL8-250605-1602-599bf8d7", + "RL9": "openhpc-RL9-250605-1602-599bf8d7" } } From 9d59f62cdd32ca41723090e0dfb7da1dc25a7003 Mon Sep 17 00:00:00 2001 From: wtripp180901 Date: Wed, 30 Jul 2025 09:04:12 +0100 Subject: [PATCH 3/8] bump snapshots --- .../inventory/group_vars/all/timestamps.yml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/environments/common/inventory/group_vars/all/timestamps.yml b/environments/common/inventory/group_vars/all/timestamps.yml index f8114f2d1..0fa1b7bf5 100644 --- a/environments/common/inventory/group_vars/all/timestamps.yml +++ b/environments/common/inventory/group_vars/all/timestamps.yml @@ -2,7 +2,7 @@ appliances_pulp_repos: appstream: '8.10': path: rocky/8.10/AppStream/x86_64/os - timestamp: 20250614T013846 + timestamp: 20250726T034100 '9.4': path: rocky/9.4/AppStream/x86_64/os timestamp: 20241112T003151 @@ -11,11 +11,11 @@ appliances_pulp_repos: timestamp: 20250514T014704 '9.6': path: rocky/9.6/AppStream/x86_64/os - timestamp: 20250605T150141 + timestamp: 20250726T040613 baseos: '8.10': path: rocky/8.10/BaseOS/x86_64/os - timestamp: 20250614T013846 + timestamp: 20250726T034100 '9.4': path: rocky/9.4/BaseOS/x86_64/os timestamp: 20241115T011711 @@ -24,18 +24,18 @@ appliances_pulp_repos: timestamp: 20250513T031844 '9.6': path: rocky/9.6/BaseOS/x86_64/os - timestamp: 20250605T150141 + timestamp: 20250726T052250 ceph: '8': path: centos/8-stream/storage/x86_64/ceph-quincy timestamp: 20231104T015751 '9': path: centos/9-stream/storage/x86_64/ceph-reef - timestamp: 20250514T025809 + timestamp: 20250617T023108 crb: '8.10': path: rocky/8.10/PowerTools/x86_64/os - timestamp: 20250614T013846 + timestamp: 20250726T034100 '9.4': path: rocky/9.4/CRB/x86_64/os timestamp: 20241115T003133 @@ -44,14 +44,14 @@ appliances_pulp_repos: timestamp: 20250514T014704 '9.6': path: rocky/9.6/CRB/x86_64/os - timestamp: 20250605T150141 + timestamp: 20250726T040613 epel: '8': path: epel/8/Everything/x86_64 - timestamp: 20250615T234151 + timestamp: 20250728T000757 '9': path: epel/9/Everything/x86_64 - timestamp: 20250615T000221 + timestamp: 20250729T235750 extras: '8.10': path: rocky/8.10/extras/x86_64/os @@ -64,14 +64,14 @@ appliances_pulp_repos: timestamp: 20250506T032818 '9.6': path: rocky/9.6/extras/x86_64/os - timestamp: 20250605T150141 + timestamp: 20250726T040613 grafana: '8': path: grafana/oss/rpm - timestamp: 20250615T005738 + timestamp: 20250730T011314 '9': path: grafana/oss/rpm - timestamp: 20250615T005738 + timestamp: 20250730T011314 openhpc_base: '8': path: OpenHPC/2/EL_8 From ca32a2d712c493012064dad1c6a5e30ea4e76bf5 Mon Sep 17 00:00:00 2001 From: wtripp180901 Date: Wed, 30 Jul 2025 11:12:58 +0100 Subject: [PATCH 4/8] image bump --- environments/.stackhpc/tofu/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json index a912e6375..6d2d3ddf0 100644 --- a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-250605-1602-599bf8d7", - "RL9": "openhpc-RL9-250605-1602-599bf8d7" + "RL8": "openhpc-RL8-250730-0820-9d59f62c", + "RL9": "openhpc-RL9-250730-0820-9d59f62c" } } From 053e6218d05f861ebff236133f91de07c4605d4c Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Wed, 30 Jul 2025 15:05:16 +0100 Subject: [PATCH 5/8] update lustre --- ansible/roles/lustre/defaults/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ansible/roles/lustre/defaults/main.yml b/ansible/roles/lustre/defaults/main.yml index 72337733c..a4f0099b4 100644 --- a/ansible/roles/lustre/defaults/main.yml +++ b/ansible/roles/lustre/defaults/main.yml @@ -1,5 +1,4 @@ -lustre_repo: https://github.com/stackhpc/lustre-release.git -lustre_version: '2.15.6/lu-18085' # Fixes https://jira.whamcloud.com/browse/LU-18085 +lustre_version: '2.15.7' lustre_lnet_label: tcp #lustre_mgs_nid: lustre_mounts: [] From f518caaa63cad719ad70ac0f4b18f8327fde48ac Mon Sep 17 00:00:00 2001 From: wtripp180901 Date: Wed, 30 Jul 2025 15:13:51 +0100 Subject: [PATCH 6/8] reverted to upstream lustre repo --- ansible/roles/lustre/README.md | 6 ++---- ansible/roles/lustre/defaults/main.yml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ansible/roles/lustre/README.md b/ansible/roles/lustre/README.md index 9abbb9b1b..0269ad6fa 100644 --- a/ansible/roles/lustre/README.md +++ b/ansible/roles/lustre/README.md @@ -19,10 +19,8 @@ The following variables control configuration of Lustre clients. - `lustre_mount_options`. Optional default mount options. Default values are systemd defaults from [Lustre client docs](http://wiki.lustre.org/Mounting_a_Lustre_File_System_on_Client_Nodes). The following variables control the package build and and install: -- `lustre_version`: Optional str. Version of lustre to build, default `2.15.6/lu-18085` - which is the first version with EL9.5 support, plus a fix for https://jira.whamcloud.com/browse/LU-18085. -- `lustre_repo`: Optional str. URL for Lustre repo. Default is a StackHPC repo - incorporating the above fix. +- `lustre_version`: Optional str. Version of lustre to build, default `2.15.7` +- `lustre_repo`: Optional str. URL for Lustre repo. Default is `git://git.whamcloud.com/fs/lustre-release`.git. - `lustre_build_packages`: Optional list. Prerequisite packages required to build Lustre. See `defaults/main.yml`. - `lustre_build_dir`: Optional str. Path to build lustre at, default `/tmp/lustre-release`. - `lustre_configure_opts`: Optional list. Options to `./configure` command. Default builds client rpms supporting Mellanox OFED, without support for GSS keys. diff --git a/ansible/roles/lustre/defaults/main.yml b/ansible/roles/lustre/defaults/main.yml index a4f0099b4..0fe5d61a1 100644 --- a/ansible/roles/lustre/defaults/main.yml +++ b/ansible/roles/lustre/defaults/main.yml @@ -6,7 +6,7 @@ lustre_mount_state: mounted lustre_mount_options: 'defaults,_netdev,noauto,x-systemd.automount,x-systemd.requires=lnet.service,nosuid,nodev' # below variables are for build and should not generally require changes -lustre_git_repo: "git://git.whamcloud.com/fs/lustre-release.git" +lustre_repo: "git://git.whamcloud.com/fs/lustre-release.git" lustre_build_packages: - "kernel-devel-{{ ansible_kernel }}" - git From a1d03ac250b6541df24f85dc029a3fea6ca0a145 Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Mon, 4 Aug 2025 11:46:45 +0100 Subject: [PATCH 7/8] revert rocky 8 bumps --- .../common/inventory/group_vars/all/timestamps.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/environments/common/inventory/group_vars/all/timestamps.yml b/environments/common/inventory/group_vars/all/timestamps.yml index 0fa1b7bf5..455c26005 100644 --- a/environments/common/inventory/group_vars/all/timestamps.yml +++ b/environments/common/inventory/group_vars/all/timestamps.yml @@ -2,7 +2,7 @@ appliances_pulp_repos: appstream: '8.10': path: rocky/8.10/AppStream/x86_64/os - timestamp: 20250726T034100 + timestamp: 20250614T013846 '9.4': path: rocky/9.4/AppStream/x86_64/os timestamp: 20241112T003151 @@ -15,7 +15,7 @@ appliances_pulp_repos: baseos: '8.10': path: rocky/8.10/BaseOS/x86_64/os - timestamp: 20250726T034100 + timestamp: 20250614T013846 '9.4': path: rocky/9.4/BaseOS/x86_64/os timestamp: 20241115T011711 @@ -35,7 +35,7 @@ appliances_pulp_repos: crb: '8.10': path: rocky/8.10/PowerTools/x86_64/os - timestamp: 20250726T034100 + timestamp: 20250614T013846 '9.4': path: rocky/9.4/CRB/x86_64/os timestamp: 20241115T003133 @@ -48,7 +48,7 @@ appliances_pulp_repos: epel: '8': path: epel/8/Everything/x86_64 - timestamp: 20250728T000757 + timestamp: 20250615T234151 '9': path: epel/9/Everything/x86_64 timestamp: 20250729T235750 @@ -68,7 +68,7 @@ appliances_pulp_repos: grafana: '8': path: grafana/oss/rpm - timestamp: 20250730T011314 + timestamp: 20250615T005738 '9': path: grafana/oss/rpm timestamp: 20250730T011314 From fd16b05bb859a9d2549373c514773ca9e4c27a16 Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Mon, 4 Aug 2025 12:43:31 +0100 Subject: [PATCH 8/8] bump image --- environments/.stackhpc/tofu/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json index 6d2d3ddf0..36533455d 100644 --- a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-250730-0820-9d59f62c", - "RL9": "openhpc-RL9-250730-0820-9d59f62c" + "RL8": "openhpc-RL8-250804-1050-baf92bc5", + "RL9": "openhpc-RL9-250804-1050-baf92bc5" } }