From 69745e9821f2cb523de61d456fce494f9cc1a4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 17 Nov 2023 14:51:03 +0100 Subject: [PATCH 1/3] add true to default, fix stratum0 check --- roles/cvmfs_server_meta_info/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/cvmfs_server_meta_info/tasks/main.yml b/roles/cvmfs_server_meta_info/tasks/main.yml index 93c7ce02..f817dd4d 100644 --- a/roles/cvmfs_server_meta_info/tasks/main.yml +++ b/roles/cvmfs_server_meta_info/tasks/main.yml @@ -7,7 +7,7 @@ group: root mode: 0644 become: true - when: (cvmfs_repositories | length) > 0 + when: (cvmfs_repositories | default(eessi_cvmfs_repositories, true) | length) > 0 - name: Create meta information for each CVMFS repository ansible.builtin.include_tasks: repo_meta_info.yml @@ -18,6 +18,6 @@ recommended-stratum0: "http://{{ item.stratum0 }}/cvmfs/{{ item.repository }}" recommended-stratum1s: "{{ eessi_cvmfs_server_urls | selectattr('domain', 'in', item.repository) | map(attribute='urls') | map('regex_replace', '@fqrn@', item.repository) }}" - with_items: "{{ cvmfs_repositories | default(eessi_cvmfs_repositories) }}" - when: "'cvmfsstratum0servers' in group_names or cvmfs_role == 'stratum0'" + with_items: "{{ cvmfs_repositories | default(eessi_cvmfs_repositories, true) }}" + when: ('cvmfsstratum0servers' in group_names and inventory_hostname in groups['cvmfsstratum0servers']) or cvmfs_role == 'stratum0' ... From 12c3bfbd3b5fca230fefd73ebc9144ef6a33b0b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 17 Nov 2023 14:51:12 +0100 Subject: [PATCH 2/3] add become: true --- roles/cvmfs_server_meta_info/tasks/repo_meta_info.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/cvmfs_server_meta_info/tasks/repo_meta_info.yml b/roles/cvmfs_server_meta_info/tasks/repo_meta_info.yml index 56a8a59c..adb4a903 100644 --- a/roles/cvmfs_server_meta_info/tasks/repo_meta_info.yml +++ b/roles/cvmfs_server_meta_info/tasks/repo_meta_info.yml @@ -26,6 +26,7 @@ ansible.builtin.command: cmd: "cvmfs_server update-repoinfo -f {{ tmp_json_file.path }} {{ this_cvmfs_repo.repository }}" when: (current_repo_meta.stdout | checksum) != json_file_stat.stat.checksum + become: true become_user: "{{ cvmfs_repo_owner | default('root') }}" - name: Remove temporary json file From e24ecdb8b344169bada318155ebe8c41781e9994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 17 Nov 2023 15:24:40 +0100 Subject: [PATCH 3/3] add ci repo --- inventory/group_vars/all.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 5ab702ca..82b0201f 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -51,6 +51,16 @@ eessi_cvmfs_repositories: client_options: [] use_for_ci: false description: "Repository that contains the EESSI software stacks." + - repository: ci.software.eessi.io + stratum0: rug-nl.stratum0.cvmfs.eessi-infra.org + owner: "{{ cvmfs_repo_owner | default('root') }}" + key_dir: /etc/cvmfs/keys/eessi.io + server_options: + - CVMFS_AUTO_GC=false + - CVMFS_GARBAGE_COLLECTION=true + client_options: [] + use_for_ci: true + description: "Small-sized epository used for CI purposes." # Meta information for CVMFS Stratum servers cvmfs_server_meta_administrator: "EESSI CVMFS Administrators"