From faa5f77af43a05026d8834a9ae9b9ae4954a15c6 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Fri, 19 Sep 2025 12:01:22 +0100 Subject: [PATCH 1/7] add Open OnDemand repos --- ansible/inventory/group_vars/all/package-repos | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ansible/inventory/group_vars/all/package-repos b/ansible/inventory/group_vars/all/package-repos index 2a6b9b27..cb85e253 100644 --- a/ansible/inventory/group_vars/all/package-repos +++ b/ansible/inventory/group_vars/all/package-repos @@ -435,6 +435,13 @@ rpm_package_repos: short_name: cernvmfs_el8_cfg sync_group: third_party distribution_name: cernvmfs-el8-cfg- + # Open Ondemand + - name: Open OnDemand Web Repo - EL8 + url: https://yum.osc.edu/ondemand/3.1/web/el8/x86_64 + base_path: ondemand_web/EL/8/x86_64/ + short_name: ondemand_web_el8 + sync_group: third_party + distribution_name: ondemand-web-el8- # Base Rocky Linux 8.10 repositories (Slurm appliance) - name: Rocky Linux 8.10 - AppStream @@ -926,6 +933,13 @@ rpm_package_repos: short_name: almalinux_9_proxysql_2_7 sync_group: third_party distribution_name: almalinux-9-proxysql-2.7- + # Open Ondemand + - name: Open OnDemand Web Repo - EL9 + url: https://yum.osc.edu/ondemand/3.1/web/el9/x86_64 + base_path: ondemand_web/EL/9/x86_64/ + short_name: ondemand_web_el9 + sync_group: third_party + distribution_name: ondemand-web-el9- # Default filter string for RPM package repositories. rpm_package_repo_filter: "" From b82c1ddc9ffddbf0d48a2e6dffa0d367201ce9ca Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Fri, 19 Sep 2025 12:29:11 +0100 Subject: [PATCH 2/7] add EPEL Cisco OpenH264 repos --- ansible/inventory/group_vars/all/package-repos | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ansible/inventory/group_vars/all/package-repos b/ansible/inventory/group_vars/all/package-repos index cb85e253..640fd301 100644 --- a/ansible/inventory/group_vars/all/package-repos +++ b/ansible/inventory/group_vars/all/package-repos @@ -689,6 +689,13 @@ rpm_package_repos: short_name: epel_9_source sync_group: epel distribution_name: extra-packages-for-enterprise-linux-9-source- + # EPEL 9 - Cisco OpenH264 + - name: Extra Packages for Enterprise Linux 9 Cisco openh264 + url: https://mirrors.fedoraproject.org/metalink?repo=epel-cisco-openh264-9&arch=x86_64 + base_path: epel-cisco-openh264/9/Everything/x86_64/ + short_name: epel_cisco_openh264_9 + distribution_name: extra-packages-for-enterprise-linux-9-cisco-openh264-x86_64- + # ELRepo 9 repository - name: ELRepo.org Community Enterprise Linux Repository - el9 # Use an HTTPS mirror rather than http from mirrorlist From acd3aa0b6b5547d3d380280b40059bbcfadb8231 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Fri, 19 Sep 2025 12:29:25 +0100 Subject: [PATCH 3/7] add TurboVNC repos --- ansible/inventory/group_vars/all/package-repos | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ansible/inventory/group_vars/all/package-repos b/ansible/inventory/group_vars/all/package-repos index 640fd301..4cec82a6 100644 --- a/ansible/inventory/group_vars/all/package-repos +++ b/ansible/inventory/group_vars/all/package-repos @@ -694,6 +694,7 @@ rpm_package_repos: url: https://mirrors.fedoraproject.org/metalink?repo=epel-cisco-openh264-9&arch=x86_64 base_path: epel-cisco-openh264/9/Everything/x86_64/ short_name: epel_cisco_openh264_9 + sync_group: epel distribution_name: extra-packages-for-enterprise-linux-9-cisco-openh264-x86_64- # ELRepo 9 repository @@ -948,6 +949,21 @@ rpm_package_repos: sync_group: third_party distribution_name: ondemand-web-el9- + # Non-distro-specific RPMs + # TurboVNC + - name: TurboVNC + url: https://packagecloud.io/dcommander/turbovnc/rpm_any/rpm_any/x86_64 + base_path: turbovnc/x86_64/ + short_name: turbovnc + sync_group: third_party + distribution_name: turbovnc- + - name: TurboVNC - source + url: https://packagecloud.io/dcommander/turbovnc/rpm_any/rpm_any/SRPMS + base_path: turbovnc/srpms/ + short_name: turbovnc-source + sync_group: third_party + distribution_name: turbovnc-source- + # Default filter string for RPM package repositories. rpm_package_repo_filter: "" From 585ab8f149fc1729d1899f5a603f57864ab66ae3 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Wed, 24 Sep 2025 15:01:37 +0100 Subject: [PATCH 4/7] bump ondemand repos to v4 --- ansible/inventory/group_vars/all/package-repos | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/inventory/group_vars/all/package-repos b/ansible/inventory/group_vars/all/package-repos index 4cec82a6..5eed6085 100644 --- a/ansible/inventory/group_vars/all/package-repos +++ b/ansible/inventory/group_vars/all/package-repos @@ -437,7 +437,7 @@ rpm_package_repos: distribution_name: cernvmfs-el8-cfg- # Open Ondemand - name: Open OnDemand Web Repo - EL8 - url: https://yum.osc.edu/ondemand/3.1/web/el8/x86_64 + url: https://yum.osc.edu/ondemand/4.0/web/el8/x86_64 base_path: ondemand_web/EL/8/x86_64/ short_name: ondemand_web_el8 sync_group: third_party @@ -943,7 +943,7 @@ rpm_package_repos: distribution_name: almalinux-9-proxysql-2.7- # Open Ondemand - name: Open OnDemand Web Repo - EL9 - url: https://yum.osc.edu/ondemand/3.1/web/el9/x86_64 + url: https://yum.osc.edu/ondemand/4.0/web/el9/x86_64 base_path: ondemand_web/EL/9/x86_64/ short_name: ondemand_web_el9 sync_group: third_party From 6eebfc7ec8ade989072773250c0816ff86ee623a Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Wed, 24 Sep 2025 16:27:56 +0100 Subject: [PATCH 5/7] address review comments --- ansible/inventory/group_vars/all/package-repos | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/inventory/group_vars/all/package-repos b/ansible/inventory/group_vars/all/package-repos index 5eed6085..25bc5f8d 100644 --- a/ansible/inventory/group_vars/all/package-repos +++ b/ansible/inventory/group_vars/all/package-repos @@ -435,10 +435,10 @@ rpm_package_repos: short_name: cernvmfs_el8_cfg sync_group: third_party distribution_name: cernvmfs-el8-cfg- - # Open Ondemand + # Open OnDemand - name: Open OnDemand Web Repo - EL8 url: https://yum.osc.edu/ondemand/4.0/web/el8/x86_64 - base_path: ondemand_web/EL/8/x86_64/ + base_path: ondemand/4.0/web/el8/x86_64/ short_name: ondemand_web_el8 sync_group: third_party distribution_name: ondemand-web-el8- @@ -691,8 +691,8 @@ rpm_package_repos: distribution_name: extra-packages-for-enterprise-linux-9-source- # EPEL 9 - Cisco OpenH264 - name: Extra Packages for Enterprise Linux 9 Cisco openh264 - url: https://mirrors.fedoraproject.org/metalink?repo=epel-cisco-openh264-9&arch=x86_64 - base_path: epel-cisco-openh264/9/Everything/x86_64/ + url: https://codecs.fedoraproject.org/openh264/epel/9/x86_64/os/ + base_path: openh264/epel/9/x86_64/os/ short_name: epel_cisco_openh264_9 sync_group: epel distribution_name: extra-packages-for-enterprise-linux-9-cisco-openh264-x86_64- @@ -944,7 +944,7 @@ rpm_package_repos: # Open Ondemand - name: Open OnDemand Web Repo - EL9 url: https://yum.osc.edu/ondemand/4.0/web/el9/x86_64 - base_path: ondemand_web/EL/9/x86_64/ + base_path: ondemand/4.0/web/el9/x86_64/ short_name: ondemand_web_el9 sync_group: third_party distribution_name: ondemand-web-el9- From 6d52ca84e9e27cf747d607dd8244b289cd26ea55 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Thu, 25 Sep 2025 10:20:53 +0100 Subject: [PATCH 6/7] fix capitalisation in comment which makes no functional difference --- ansible/inventory/group_vars/all/package-repos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/inventory/group_vars/all/package-repos b/ansible/inventory/group_vars/all/package-repos index 25bc5f8d..b6109945 100644 --- a/ansible/inventory/group_vars/all/package-repos +++ b/ansible/inventory/group_vars/all/package-repos @@ -941,7 +941,7 @@ rpm_package_repos: short_name: almalinux_9_proxysql_2_7 sync_group: third_party distribution_name: almalinux-9-proxysql-2.7- - # Open Ondemand + # Open OnDemand - name: Open OnDemand Web Repo - EL9 url: https://yum.osc.edu/ondemand/4.0/web/el9/x86_64 base_path: ondemand/4.0/web/el9/x86_64/ From d16a7f5f46b57e42c420f5f3175d98f5c00239f7 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Thu, 25 Sep 2025 13:04:34 +0100 Subject: [PATCH 7/7] fix - in short_name --- ansible/inventory/group_vars/all/package-repos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/inventory/group_vars/all/package-repos b/ansible/inventory/group_vars/all/package-repos index b6109945..c2253982 100644 --- a/ansible/inventory/group_vars/all/package-repos +++ b/ansible/inventory/group_vars/all/package-repos @@ -960,7 +960,7 @@ rpm_package_repos: - name: TurboVNC - source url: https://packagecloud.io/dcommander/turbovnc/rpm_any/rpm_any/SRPMS base_path: turbovnc/srpms/ - short_name: turbovnc-source + short_name: turbovnc_source sync_group: third_party distribution_name: turbovnc-source-