From f9e06d69aeda7525773dc631eedc9ba9661b5791 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Wed, 4 Mar 2026 15:14:43 +0000 Subject: [PATCH 1/5] bump ondemand to v4.1 --- ansible/inventory/group_vars/all/rpm-package-repos | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/inventory/group_vars/all/rpm-package-repos b/ansible/inventory/group_vars/all/rpm-package-repos index b6f63684..780c50a7 100644 --- a/ansible/inventory/group_vars/all/rpm-package-repos +++ b/ansible/inventory/group_vars/all/rpm-package-repos @@ -127,8 +127,8 @@ rpm_package_repos: distribution_name: cernvmfs-el8-cfg- # Open OnDemand - name: Open OnDemand Web Repo - EL8 - url: https://yum.osc.edu/ondemand/4.0/web/el8/x86_64 - base_path: ondemand/4.0/web/el8/x86_64/ + url: https://yum.osc.edu/ondemand/4.1/web/el8/x86_64 + base_path: ondemand/4.1/web/el8/x86_64/ short_name: ondemand_web_el8 sync_group: third_party distribution_name: ondemand-web-el8- @@ -662,8 +662,8 @@ rpm_package_repos: distribution_name: almalinux-9-proxysql-2.7- # 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/ + url: https://yum.osc.edu/ondemand/4.1/web/el9/x86_64 + base_path: ondemand/4.1/web/el9/x86_64/ short_name: ondemand_web_el9 sync_group: third_party distribution_name: ondemand-web-el9- From a2c3e26bfbb48206272546816c582bd6c2983226 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Wed, 4 Mar 2026 15:48:33 +0000 Subject: [PATCH 2/5] add v4.0 and v4.1 in parallel --- .../group_vars/all/rpm-package-repos | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/ansible/inventory/group_vars/all/rpm-package-repos b/ansible/inventory/group_vars/all/rpm-package-repos index 780c50a7..cf99e5c2 100644 --- a/ansible/inventory/group_vars/all/rpm-package-repos +++ b/ansible/inventory/group_vars/all/rpm-package-repos @@ -127,11 +127,17 @@ rpm_package_repos: distribution_name: cernvmfs-el8-cfg- # Open OnDemand - name: Open OnDemand Web Repo - EL8 - url: https://yum.osc.edu/ondemand/4.1/web/el8/x86_64 - base_path: ondemand/4.1/web/el8/x86_64/ + url: https://yum.osc.edu/ondemand/4.0/web/el8/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- + - name: Open OnDemand Web Repo v4.1 - EL8 + url: https://yum.osc.edu/ondemand/4.1/web/el8/x86_64 + base_path: ondemand/4.1/web/el8/x86_64/ + short_name: ondemand_web_el8_4_1 + sync_group: third_party + distribution_name: ondemand-web-el8-4.1 # Base Rocky Linux 8.10 repositories (Slurm appliance) - name: Rocky Linux 8.10 - AppStream @@ -662,11 +668,17 @@ rpm_package_repos: distribution_name: almalinux-9-proxysql-2.7- # Open OnDemand - name: Open OnDemand Web Repo - EL9 - url: https://yum.osc.edu/ondemand/4.1/web/el9/x86_64 - base_path: ondemand/4.1/web/el9/x86_64/ + url: https://yum.osc.edu/ondemand/4.0/web/el9/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- + - name: Open OnDemand Web Repo v4.1 - EL9 + url: https://yum.osc.edu/ondemand/4.1/web/el9/x86_64 + base_path: ondemand/4.1/web/el9/x86_64/ + short_name: ondemand_web_el9_v4.1 + sync_group: third_party + distribution_name: ondemand-web-el9-v4.1 # Non-distro-specific RPMs # TurboVNC From f2c238be2046b46affe2b39b7847bb58920b827b Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Wed, 4 Mar 2026 15:54:35 +0000 Subject: [PATCH 3/5] add trailing dash --- ansible/inventory/group_vars/all/rpm-package-repos | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/inventory/group_vars/all/rpm-package-repos b/ansible/inventory/group_vars/all/rpm-package-repos index cf99e5c2..be1c90e4 100644 --- a/ansible/inventory/group_vars/all/rpm-package-repos +++ b/ansible/inventory/group_vars/all/rpm-package-repos @@ -137,7 +137,7 @@ rpm_package_repos: base_path: ondemand/4.1/web/el8/x86_64/ short_name: ondemand_web_el8_4_1 sync_group: third_party - distribution_name: ondemand-web-el8-4.1 + distribution_name: ondemand-web-el8-4.1- # Base Rocky Linux 8.10 repositories (Slurm appliance) - name: Rocky Linux 8.10 - AppStream @@ -678,7 +678,7 @@ rpm_package_repos: base_path: ondemand/4.1/web/el9/x86_64/ short_name: ondemand_web_el9_v4.1 sync_group: third_party - distribution_name: ondemand-web-el9-v4.1 + distribution_name: ondemand-web-el9-v4.1- # Non-distro-specific RPMs # TurboVNC From 1c98f8c5c1e2c7891a9831eb2b5a9e063458cd3c Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Wed, 4 Mar 2026 15:58:09 +0000 Subject: [PATCH 4/5] try to get names right --- ansible/inventory/group_vars/all/rpm-package-repos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/inventory/group_vars/all/rpm-package-repos b/ansible/inventory/group_vars/all/rpm-package-repos index be1c90e4..e625ac6e 100644 --- a/ansible/inventory/group_vars/all/rpm-package-repos +++ b/ansible/inventory/group_vars/all/rpm-package-repos @@ -676,7 +676,7 @@ rpm_package_repos: - name: Open OnDemand Web Repo v4.1 - EL9 url: https://yum.osc.edu/ondemand/4.1/web/el9/x86_64 base_path: ondemand/4.1/web/el9/x86_64/ - short_name: ondemand_web_el9_v4.1 + short_name: ondemand_web_el9_4_1 sync_group: third_party distribution_name: ondemand-web-el9-v4.1- From 1ac1f31685d15ced51a34c77f1f3335ab8d4d043 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Wed, 4 Mar 2026 16:03:29 +0000 Subject: [PATCH 5/5] try to get names right (again) --- ansible/inventory/group_vars/all/rpm-package-repos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/inventory/group_vars/all/rpm-package-repos b/ansible/inventory/group_vars/all/rpm-package-repos index e625ac6e..94697fe6 100644 --- a/ansible/inventory/group_vars/all/rpm-package-repos +++ b/ansible/inventory/group_vars/all/rpm-package-repos @@ -678,7 +678,7 @@ rpm_package_repos: base_path: ondemand/4.1/web/el9/x86_64/ short_name: ondemand_web_el9_4_1 sync_group: third_party - distribution_name: ondemand-web-el9-v4.1- + distribution_name: ondemand-web-el9-4.1- # Non-distro-specific RPMs # TurboVNC