From bc36b78121e8828855be9b247f2ea07fe8113882 Mon Sep 17 00:00:00 2001 From: wtripp180901 Date: Tue, 17 Dec 2024 14:19:08 +0000 Subject: [PATCH 1/6] testing enabling release train for 8.10 --- .github/workflows/nightlybuild.yml | 2 +- ansible/bootstrap.yml | 1 - ansible/disable-repos.yml | 1 - ansible/roles/dnf_repos/defaults/main.yml | 24 +++++++++++++++---- .../inventory/group_vars/all/defaults.yml | 5 ++++ 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.github/workflows/nightlybuild.yml b/.github/workflows/nightlybuild.yml index 2485cd2df..ec920ce8d 100644 --- a/.github/workflows/nightlybuild.yml +++ b/.github/workflows/nightlybuild.yml @@ -25,7 +25,7 @@ jobs: matrix: # build RL8, RL9 build: - image_name: rocky-latest-RL8 - source_image_name: Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2 + source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.qcow2 inventory_groups: update - image_name: rocky-latest-RL9 source_image_name: Rocky-9-GenericCloud-Base-9.4-20240523.0.x86_64.qcow2 diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml index a504f3545..e2497d9c6 100644 --- a/ansible/bootstrap.yml +++ b/ansible/bootstrap.yml @@ -122,7 +122,6 @@ ansible.builtin.include_role: name: dnf_repos tasks_from: set_repos.yml - when: ansible_distribution_major_version == "9" #TODO update role once RL8 config decided # --- tasks after here require access to package repos --- - hosts: squid diff --git a/ansible/disable-repos.yml b/ansible/disable-repos.yml index d7dc4fd55..3e8022965 100644 --- a/ansible/disable-repos.yml +++ b/ansible/disable-repos.yml @@ -5,4 +5,3 @@ ansible.builtin.include_role: name: dnf_repos tasks_from: disable_repos.yml - when: ansible_distribution_major_version == "9" #TODO update role once RL8 config decided diff --git a/ansible/roles/dnf_repos/defaults/main.yml b/ansible/roles/dnf_repos/defaults/main.yml index 4a0c9fd2a..eb740e084 100644 --- a/ansible/roles/dnf_repos/defaults/main.yml +++ b/ansible/roles/dnf_repos/defaults/main.yml @@ -4,18 +4,32 @@ dnf_repos_epel_prefix: "epel/{{ ansible_distribution_major_version }}" dnf_repos_username: "{{ omit }}" dnf_repos_password: "{{ omit }}" +dnf_repos_filenames: + '8': + baseos: 'Rocky-BaseOS' + appstream: 'Rocky-AppStream' + crb: 'Rocky-PowerTools' + extras: 'Rocky-Extras' + '9': + baseos: 'rocky' + appstream: 'rocky' + crb: 'rocky' + extras: 'rocky-extras' + +dnf_repos_version_filenames: "{{ dnf_repos_filenames[ansible_distribution_major_version] }}" + # epel installed separately dnf_repos_repolist: -- file: rocky +- file: "{{ dnf_repos_version_filenames.baseos }}" name: baseos base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/BaseOS/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.baseos[ansible_distribution_version] }}" -- file: rocky +- file: "{{ dnf_repos_version_filenames.appstream }}" name: appstream base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/AppStream/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.appstream[ansible_distribution_version] }}" -- file: rocky - name: crb +- file: "{{ dnf_repos_version_filenames.crb }}" + name: "{{ 'powertools' if ansible_distribution_major_version == '8' else 'crb' }}" base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/CRB/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.crb[ansible_distribution_version] }}" -- file: rocky-extras +- file: "{{ dnf_repos_version_filenames.extras }}" name: extras base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/extras/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.extras[ansible_distribution_version] }}" diff --git a/environments/common/inventory/group_vars/all/defaults.yml b/environments/common/inventory/group_vars/all/defaults.yml index 1bac4590d..a9b7224d8 100644 --- a/environments/common/inventory/group_vars/all/defaults.yml +++ b/environments/common/inventory/group_vars/all/defaults.yml @@ -85,11 +85,16 @@ appliances_local_users: "{{ appliances_local_users_default + appliances_local_us appliances_repo_timestamps: baseos: '9.4': 20240816T002610 + '8.10': 20241217T123729 appstream: '9.4': 20240816T002610 + '8.10': 20241217T123729 crb: '9.4': 20240816T002610 + '8.10': 20241217T123729 extras: '9.4': 20240816T002610 + '8.10': 20241217T123729 epel: '9': 20240902T080424 + '8': 20241216T235733 From a9e53ba6a79857d09f1b8b95b5fe919089a9677d Mon Sep 17 00:00:00 2001 From: wtripp180901 Date: Tue, 17 Dec 2024 14:21:40 +0000 Subject: [PATCH 2/6] Temporarily (?) building from rocky 8 genericcloud + update in fatimage --- .github/workflows/fatimage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml index 331035001..7d7571133 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -23,8 +23,8 @@ jobs: matrix: # build RL8, RL9 build: - image_name: openhpc-RL8 - source_image_name: rocky-latest-RL8 - inventory_groups: control,compute,login + 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-latest-RL9 inventory_groups: control,compute,login From 1faf4e523cf7db91e59327d978ab0aeffd05a41e Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Tue, 17 Dec 2024 15:10:41 +0000 Subject: [PATCH 3/6] stopped openhpc overwriting epel 8 --- environments/common/inventory/group_vars/all/openhpc.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/environments/common/inventory/group_vars/all/openhpc.yml b/environments/common/inventory/group_vars/all/openhpc.yml index a23bc77ba..cf2762f17 100644 --- a/environments/common/inventory/group_vars/all/openhpc.yml +++ b/environments/common/inventory/group_vars/all/openhpc.yml @@ -41,10 +41,4 @@ openhpc_state_save_location: "{{ appliances_state_dir + '/slurmctld' if applianc ohpc_default_extra_repos: "9": [] #overriding to ensure doesn't overwrite ark epel repo - "8": - - name: epel - file: epel - description: "Extra Packages for Enterprise Linux 8 - $basearch" - metalink: "https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch&infra=$infra&content=$contentdir" - gpgcheck: true - gpgkey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8" + "8": [] From 6ce4953d483ba8939bdd6c344b0ecc068179a258 Mon Sep 17 00:00:00 2001 From: wtripp180901 Date: Wed, 18 Dec 2024 08:57:08 +0000 Subject: [PATCH 4/6] fixed broken powertools repo --- ansible/roles/dnf_repos/defaults/main.yml | 2 +- ansible/roles/dnf_repos/tasks/set_repos.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ansible/roles/dnf_repos/defaults/main.yml b/ansible/roles/dnf_repos/defaults/main.yml index eb740e084..89a8229f7 100644 --- a/ansible/roles/dnf_repos/defaults/main.yml +++ b/ansible/roles/dnf_repos/defaults/main.yml @@ -28,7 +28,7 @@ dnf_repos_repolist: base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/AppStream/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.appstream[ansible_distribution_version] }}" - file: "{{ dnf_repos_version_filenames.crb }}" name: "{{ 'powertools' if ansible_distribution_major_version == '8' else 'crb' }}" - base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/CRB/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.crb[ansible_distribution_version] }}" + base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/{{ 'PowerTools' if ansible_distribution_major_version == '8' else 'CRB' }}/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.crb[ansible_distribution_version] }}" - file: "{{ dnf_repos_version_filenames.extras }}" name: extras base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/extras/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.extras[ansible_distribution_version] }}" diff --git a/ansible/roles/dnf_repos/tasks/set_repos.yml b/ansible/roles/dnf_repos/tasks/set_repos.yml index fe5e2c02c..c9fcb0c07 100644 --- a/ansible/roles/dnf_repos/tasks/set_repos.yml +++ b/ansible/roles/dnf_repos/tasks/set_repos.yml @@ -8,6 +8,7 @@ description: "{{ item.name }}" username: "{{ dnf_repos_username }}" password: "{{ dnf_repos_password }}" + gpgcheck: false loop: "{{ dnf_repos_repolist }}" - name: Install epel-release From 29a157910b3c32414899d88b22dbb7446ce57bd0 Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Wed, 18 Dec 2024 09:57:33 +0000 Subject: [PATCH 5/6] bump --- .../.stackhpc/terraform/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json index 989b9f9bb..5e5acebeb 100644 --- a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-241216-1146-18b220e1", - "RL9": "openhpc-RL9-241216-1146-18b220e1" + "RL8": "openhpc-RL8-241218-0900-a99d8be6", + "RL9": "openhpc-RL9-241218-0859-a99d8be6" } } From 36ca0d5c0f1e21f74444aa69df6270362cc81885 Mon Sep 17 00:00:00 2001 From: wtripp180901 Date: Thu, 2 Jan 2025 12:12:34 +0000 Subject: [PATCH 6/6] bump --- .../.stackhpc/terraform/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json index 8a9e3b66a..8061cf356 100644 --- a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-241220-1131-a2dde143", - "RL9": "openhpc-RL9-241220-1131-a2dde143" + "RL8": "openhpc-RL8-250102-1135-8c98e169", + "RL9": "openhpc-RL9-250102-1135-8c98e169" } }