Merge pull request #832 from stackhpc/feat/all-ark-repofiles

Use Ark repofiles for additional repos

Author: bertiethorpe

ansible/roles/dnf_repos/tasks/disable_repos.yml

@@ -10,9 +10,10 @@
   loop: "{{ dnf_repos_repos | dict2items }}"
   loop_control:
     label: "{{ repo_name }}[{{ repo_os }}]: {{ repo_values }}"
+  when: repo_values | length > 0
   vars:
     repo_os: "{{ ansible_distribution_version if ansible_distribution_version in item.value else ansible_distribution_major_version }}"
-    repo_values: "{{ item.value[repo_os] }}"
+    repo_values: "{{ item.value.get(repo_os, {}) }}"
     repo_name: "{{ repo_values.repo_name | default(item.key) }}"
     repo_content_url: "{{ repo_values.pulp_content_url | default(dnf_repos_pulp_content_url) }}"
 

ansible/roles/dnf_repos/tasks/set_repos.yml

@@ -12,10 +12,12 @@
   loop: "{{ dnf_repos_repos | dict2items }}"
   loop_control:
     label: "{{ repo_name }}[{{ repo_os }}]: {{ repo_values }}"
-  when: repo_name != 'epel'
+  when:
+    - repo_name != 'epel'
+    - repo_values | length > 0
   vars:
     repo_os: "{{ ansible_distribution_version if ansible_distribution_version in item.value else ansible_distribution_major_version }}"
-    repo_values: "{{ item.value[repo_os] }}"
+    repo_values: "{{ item.value.get(repo_os, {}) }}"
     repo_name: "{{ repo_values.repo_name | default(item.key) }}"
     repo_content_url: "{{ repo_values.pulp_content_url | default(dnf_repos_pulp_content_url) }}"
 
@@ -36,9 +38,11 @@
   loop: "{{ dnf_repos_repos | dict2items }}"
   loop_control:
     label: "{{ repo_name }}[{{ repo_os }}]: {{ repo_values }}"
-  when: repo_name == 'epel'
+  when:
+    - repo_name == 'epel'
+    - repo_values | length > 0
   vars:
     repo_os: "{{ ansible_distribution_version if ansible_distribution_version in item.value else ansible_distribution_major_version }}"
-    repo_values: "{{ item.value[repo_os] }}"
+    repo_values: "{{ item.value.get(repo_os, {}) }}"
     repo_name: "{{ repo_values.repo_name | default(item.key) }}"
     repo_content_url: "{{ repo_values.pulp_content_url | default(dnf_repos_pulp_content_url) }}"

ansible/roles/eessi/tasks/install.yml

@@ -11,9 +11,7 @@
 - name: Import downloaded GPG key # noqa: no-changed-when
   ansible.builtin.command: rpm --import cvmfs-key.gpg # noqa: command-instead-of-module
 
-- name: Add CVMFS repo
-  ansible.builtin.dnf:
-    name: "https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-{{ cvmfs_release_version }}.noarch.rpm"
+# cvmfs repo provided by dnf_repos role
 
 - name: Install CVMFS
   ansible.builtin.dnf:

ansible/roles/openondemand/defaults/main.yml

@@ -102,6 +102,9 @@ openondemand_osc_ood_defaults:
   ood_auth_openidc: "{{ openondemand_auth_defaults.oidc.ood_auth_openidc if (openondemand_auth | lower) == 'oidc' else none }}"
   httpd_auth: "{{ openondemand_auth_defaults[openondemand_auth | lower].httpd_auth }}"
 
+  # Use repo file provided by dnf_repos by default
+  ood_use_existing_repo_file: true
+
 openondemand_code_server_version: 4.102.2
 openondemand_rstudio_version: 2025.05.1-513
 openondemand_matlab_version: ''

ansible/roles/openondemand/tasks/vnc_compute.yml

@@ -1,16 +1,7 @@
 ---
 # Should be run on compute nodes you want to run the graphical desktop on
-- name: Enable TurboVNC repo
-  tags: install
-  ansible.builtin.get_url:
-    url: https://raw.githubusercontent.com/TurboVNC/repo/main/TurboVNC.repo
-    dest: /etc/yum.repos.d/TurboVNC.repo
-    mode: "0644"
 
-- name: Install EPEL
-  tags: install
-  ansible.builtin.dnf:
-    name: epel-release
+# EPEL and TurboVNC repos are provided by dnf_repos role
 
 - name: Check /etc/init.d
   ansible.builtin.stat:

environments/.stackhpc/tofu/cluster_image.auto.tfvars.json

@@ -1,6 +1,6 @@
 {
   "cluster_image": {
-    "RL8": "openhpc-RL8-251021-1221-915ed3fc",
-    "RL9": "openhpc-RL9-251021-1221-915ed3fc"
+    "RL8": "openhpc-RL8-251027-1123-d389c00b",
+    "RL9": "openhpc-RL9-251027-1123-d389c00b"
   }
 }

environments/common/inventory/group_vars/all/dnf_repo_timestamps.yml

@@ -124,6 +124,11 @@ dnf_repos_default:
       pulp_path: epel/9/Everything/source
       pulp_timestamp: 20250923T001717
       repo_file: epel
+  epel-cisco-openh264:
+    '9':
+      pulp_path: openh264/epel/9/x86_64/os
+      pulp_timestamp: 20250925T130153
+      repo_file: epel-cisco-openh264
   extras:
     '8.10':
       pulp_path: rocky/8.10/extras/x86_64/os
@@ -160,3 +165,48 @@ dnf_repos_default:
       pulp_path: grafana/oss/rpm
       pulp_timestamp: 20250917T024714
       repo_file: grafana
+  ondemand-web:
+    '8':
+      pulp_path: ondemand/4.0/web/el8/x86_64
+      pulp_timestamp: 20250925T130153
+      repo_file: ondemand-web
+    '9':
+      pulp_path: ondemand/4.0/web/el9/x86_64
+      pulp_timestamp: 20250925T130153
+      repo_file: ondemand-web
+  TurboVNC:
+    '8':
+      pulp_path: turbovnc/x86_64
+      pulp_timestamp: 20251009T091906
+      repo_file: TurboVNC
+    '9':
+      pulp_path: turbovnc/x86_64
+      pulp_timestamp: 20251009T091906
+      repo_file: TurboVNC
+  TurboVNC-source:
+    '8':
+      pulp_path: turbovnc/srpms
+      pulp_timestamp: 20251009T091906
+      repo_file: TurboVNC
+    '9':
+      pulp_path: turbovnc/srpms
+      pulp_timestamp: 20251009T091906
+      repo_file: TurboVNC
+  cernvmfs_pkgs:
+    '8':
+      pulp_path: cvmfs/EL/8/x86_64
+      pulp_timestamp: 20250816T005446
+      repo_file: cvmfs
+    '9':
+      pulp_path: cvmfs/EL/9/x86_64
+      pulp_timestamp: 20250816T005446
+      repo_file: cvmfs
+  cernvmfs_cfg:
+    '8':
+      pulp_path: cvmfs-config/EL/8/x86_64
+      pulp_timestamp: 20250805T130249
+      repo_file: cvmfs
+    '9':
+      pulp_path: cvmfs-config/EL/9/x86_64
+      pulp_timestamp: 20250805T130249
+      repo_file: cvmfs