iRODS 4.3.3 - Updated iRODS roles

UtrechtUniversity · Nov 20, 2024 · 54cdfcf · 54cdfcf
1 parent b235d46
commit 54cdfcf
Show file tree

Hide file tree

Showing 32 changed files with 119 additions and 125 deletions.
diff --git a/roles/common/meta/main.yml b/roles/common/meta/main.yml
@@ -9,7 +9,7 @@ galaxy_info:
   platforms:
     - name: EL
       version:
-        - 7
         - 8
+        - 9
     - name: Ubuntu
-      version: focal
+      version: jammy
diff --git a/roles/common/tasks/irods-debian.yml b/roles/common/tasks/irods-debian.yml
@@ -9,6 +9,6 @@
 
 - name: Ensure iRODS packages APT repository is enabled
   ansible.builtin.apt_repository:
-    repo: deb [arch=amd64] https://packages.irods.org/apt/ bionic main
+    repo: deb [arch=amd64] https://packages.irods.org/apt/ jammy main
     filename: renci-irods
     state: present
diff --git a/roles/icat_database_checker/meta/main.yml b/roles/icat_database_checker/meta/main.yml
@@ -8,9 +8,9 @@ galaxy_info:
   min_ansible_version: '2.11'
   platforms:
     - name: EL
-      version: 7
+      version: 8
     - name: Ubuntu
-      version: focal
+      version: jammy
 
 
 dependencies:

diff --git a/roles/irods_arb/meta/main.yml b/roles/irods_arb/meta/main.yml
@@ -8,9 +8,9 @@ galaxy_info:
   min_ansible_version: '2.11'
   platforms:
     - name: EL
-      version: 7
+      version: 8
     - name: Ubuntu
-      version: focal
+      version: jammy
 
 
 dependencies:

diff --git a/roles/irods_consistency_check/meta/main.yml b/roles/irods_consistency_check/meta/main.yml
@@ -8,9 +8,9 @@ galaxy_info:
   min_ansible_version: '2.11'
   platforms:
     - name: EL
-      version: 7
+      version: 8
     - name: Ubuntu
-      version: focal
+      version: jammy
 
 
 dependencies:

diff --git a/roles/irods_database/meta/main.yml b/roles/irods_database/meta/main.yml
@@ -9,10 +9,10 @@ galaxy_info:
   platforms:
     - name: EL
       version:
-        - 7
         - 8
+        - 9
     - name: Ubuntu
-      version: focal
+      version: jammy
 
 
 dependencies:

diff --git a/roles/irods_gocommands/meta/main.yml b/roles/irods_gocommands/meta/main.yml
@@ -8,6 +8,6 @@ galaxy_info:
   min_ansible_version: "2.7"
   platforms:
     - name: EL
-      version: 7
+      version: 8
     - name: Ubuntu
-      version: focal
+      version: jammy
diff --git a/roles/irods_icat/meta/main.yml b/roles/irods_icat/meta/main.yml
@@ -8,9 +8,9 @@ galaxy_info:
   min_ansible_version: '2.11'
   platforms:
     - name: EL
-      version: 7
+      version: 8
     - name: Ubuntu
-      version: focal
+      version: jammy
 
 
 dependencies:

diff --git a/roles/irods_icat/templates/irods_indexing.pref.j2 b/roles/irods_icat/templates/irods_indexing.pref.j2
@@ -11,9 +11,3 @@ Explanation: Pin added by role: irods_icat
 Package: {{ irods_esp[0] }}
 Pin: version {{ irods_esp[1] }}
 Pin-Priority: 999
-
-{% set irods_dtp = irods_dtp_package_new.split('=') %}
-Explanation: Pin added by role: irods_icat
-Package: {{ irods_dtp[0] }}
-Pin: version {{ irods_dtp[1] }}
-Pin-Priority: 999
diff --git a/roles/irods_icat/vars/Debian.yml b/roles/irods_icat/vars/Debian.yml
@@ -8,10 +8,10 @@ pam_radius_package: libpam-radius-auth
 
 irods_icat_pip2_path: /usr/local/bin/pip2
 
-irods_runtime_package_new: irods-runtime=4.2.12-1~bionic
-irods_server_package_new: irods-server=4.2.12-1~bionic
-irods_prep_package_new: irods-rule-engine-plugin-python=4.2.12.0-1~bionic
-irods_pgp_package_new: irods-database-plugin-postgres=4.2.12-1~bionic
-irods_idp_package_new: irods-rule-engine-plugin-indexing=4.2.12.0-1~bionic
-irods_esp_package_new: irods-rule-engine-plugin-elasticsearch=4.2.12.0-1~bionic
-irods_dtp_package_new: irods-rule-engine-plugin-document-type=4.2.12.0-1~bionic
+irods_runtime_package_new: irods-runtime=4.3.3-0~jammy
+irods_server_package_new: irods-server=4.3.3-0~jammy
+irods_prep_package_new: irods-rule-engine-plugin-python=4.3.3.0-0~jammy
+irods_pgp_package_new: irods-database-plugin-postgres=4.3.3-0~jammy
+irods_idp_package_new: irods-rule-engine-plugin-indexing=4.3.3.0-0~jammy
+irods_esp_package_new: irods-rule-engine-plugin-elasticsearch=4.3.3.0-0~jammy
+# irods_dtp_package_new: irods-rule-engine-plugin-document-type=4.2.12.0-1~bionic
diff --git a/roles/irods_icat/vars/RedHat.yml b/roles/irods_icat/vars/RedHat.yml
@@ -8,10 +8,10 @@ pam_radius_package: pam_radius
 
 irods_icat_pip2_path: /usr/bin/pip
 
-irods_runtime_package_new: irods-runtime-4.2.12-1
-irods_server_package_new: irods-server-4.2.12-1
-irods_prep_package_new: irods-rule-engine-plugin-python-4.2.12.0-1
-irods_pgp_package_new: irods-database-plugin-postgres-4.2.12-1
-irods_idp_package_new: irods-rule-engine-plugin-indexing-4.2.12.0-1
-irods_esp_package_new: irods-rule-engine-plugin-elasticsearch-4.2.12.0-1
-irods_dtp_package_new: irods-rule-engine-plugin-document-type-4.2.12.0-1
+irods_runtime_package_new: irods-runtime-4.3.3-0
+irods_server_package_new: irods-server-4.3.3-0
+irods_prep_package_new: irods-rule-engine-plugin-python-4.3.3.0-0
+irods_pgp_package_new: irods-database-plugin-postgres-4.3.3-0
+irods_idp_package_new: irods-rule-engine-plugin-indexing-4.3.3.0-0
+irods_esp_package_new: irods-rule-engine-plugin-elasticsearch-4.3.3.0-0
+# irods_dtp_package_new: irods-rule-engine-plugin-document-type-4.2.12.0-1
diff --git a/roles/irods_icommands/meta/main.yml b/roles/irods_icommands/meta/main.yml
@@ -8,9 +8,9 @@ galaxy_info:
   min_ansible_version: '2.11'
   platforms:
     - name: EL
-      version: 7
+      version: 8
     - name: Ubuntu
-      version: focal
+      version: jammy
 
 
 dependencies:

diff --git a/roles/irods_icommands/vars/Debian.yml b/roles/irods_icommands/vars/Debian.yml
@@ -1,4 +1,4 @@
 ---
 # copyright Utrecht University
 
-irods_icommands_package_new: irods-icommands=4.2.12-1~bionic
+irods_icommands_package_new: irods-icommands=4.3.3-0~jammy
diff --git a/roles/irods_icommands/vars/RedHat.yml b/roles/irods_icommands/vars/RedHat.yml
@@ -1,4 +1,4 @@
 ---
 # copyright Utrecht University
 
-irods_icommands_package_new: irods-icommands-4.2.12-1
+irods_icommands_package_new: irods-icommands-4.3.3-0
diff --git a/roles/irods_microservices/meta/main.yml b/roles/irods_microservices/meta/main.yml
@@ -8,9 +8,9 @@ galaxy_info:
   min_ansible_version: '2.11'
   platforms:
     - name: EL
-      version: 7
+      version: 8
     - name: Ubuntu
-      version: focal
+      version: jammy
 
 
 dependencies:

diff --git a/roles/irods_microservices/vars/Debian.yml b/roles/irods_microservices/vars/Debian.yml
@@ -4,13 +4,13 @@
 irods_microservices_data:
   irods_sudo_microservices:
     package: irods-sudo-microservices
-    version: 4.2.12_1.0.0-1
-    url: https://github.com/UtrechtUniversity/irods-sudo-microservices/releases/download/4.2.12_1.0.0/irods-sudo-microservices-4.2.12-1.0.0-1.deb
-    filename: irods-sudo-microservices-4.2.12_1.0.0-1.rpm
-    checksum: sha256:508cf7284353b832a95e4f818760bf631456607feb5946af0297e849207fdfb4
+    version: 4.3.3-1.0.0-1
+    url: https://github.com/UtrechtUniversity/yoda/releases/download/v1.9.3/irods-sudo-microservices-4.3.3-1.0.0-1.deb
+    filename: irods-sudo-microservices-4.3.3-1.0.0-1.deb
+    checksum: sha256:36bafe999a8d0768b70e0973ca5143d16c9943c97fdea880a1bd090dfc370714
   irods_uu_microservices:
     package: irods-uu-microservices
-    version: 4.2.12-1.2.0-0
-    url: https://github.com/UtrechtUniversity/irods-uu-microservices/releases/download/v1.2.0/irods-uu-microservices-4.2.12-1.2.0-0.deb
-    filename: irods-uu-microservices-4.2.12-1.2.0-0.deb
-    checksum: sha256:6b2334535d953bc70a083873adbbe1de57707fd088d7d5d52379a412001c13ff
+    version: 4.3.3-1.2.0-0
+    url: https://github.com/UtrechtUniversity/yoda/releases/download/v1.9.3/irods-uu-microservices-4.3.3-1.2.0-0.deb
+    filename: irods-uu-microservices-4.3.3-1.2.0-0.deb
+    checksum: sha256:4ab3379989c498cfe82b767bee934ff6b154e627b7eabcd2c90399ecf267d73f
diff --git a/roles/irods_remove_old_version/meta/main.yml b/roles/irods_remove_old_version/meta/main.yml
@@ -8,6 +8,6 @@ galaxy_info:
   min_ansible_version: '2.11'
   platforms:
     - name: EL
-      version: 7
+      version: 8
     - name: Ubuntu
-      version: focal
+      version: jammy
diff --git a/roles/irods_remove_old_version/vars/Debian.yml b/roles/irods_remove_old_version/vars/Debian.yml
@@ -1,14 +1,14 @@
 ---
 # copyright Utrecht University
 
-irods_uu_microservices_package_old: irods-uu-microservices=4.2.11_0.8.2-1
-irods_sudo_microservices_package_old: irods-sudo-microservices=4.2.11_1.0.0-1
-irods_runtime_package_old: irods-runtime=4.2.11-1~bionic
-irods_server_package_old: irods-server=4.2.11-1~bionic
-irods_icommands_package_old: irods-icommands=4.2.11-1~bionic
-irods_prep_package_old: irods-rule-engine-plugin-python=4.2.11.1-1~bionic
-irods_pgp_package_old: irods-database-plugin-postgres=4.2.11-1~bionic
-irods_idp_package_old: irods-rule-engine-plugin-indexing=4.2.11.0-1~bionic
-irods_esp_package_old: irods-rule-engine-plugin-elasticsearch=4.2.11.0-1~bionic
-irods_dtp_package_old: irods-rule-engine-plugin-document-type=4.2.11.0-1~bionic
-irods_davrods_package_old: davrods=4.2.11_1.5.0-1
+irods_uu_microservices_package_old: irods-uu-microservices=4.2.12-1.2.0-0
+irods_sudo_microservices_package_old: irods-sudo-microservices=4.2.12_1.0.0-1
+irods_runtime_package_old: irods-runtime=4.2.12-1~bionic
+irods_server_package_old: irods-server=4.2.12-1~bionic
+irods_icommands_package_old: irods-icommands=4.2.12-1~bionic
+irods_prep_package_old: irods-rule-engine-plugin-python=4.2.12.0-1~bionic
+irods_pgp_package_old: irods-database-plugin-postgres=4.2.12-1~bionic
+irods_idp_package_old: irods-rule-engine-plugin-indexing=4.2.12.0-1~bionic
+irods_esp_package_old: irods-rule-engine-plugin-elasticsearch=4.2.12.0-1~bionic
+irods_dtp_package_old: irods-rule-engine-plugin-document-type=4.2.12.0-1~bionic
+irods_davrods_package_old: davrods=4.2.12_1.5.1-1
diff --git a/roles/irods_remove_old_version/vars/RedHat.yml b/roles/irods_remove_old_version/vars/RedHat.yml
@@ -1,14 +1,14 @@
 ---
 # copyright Utrecht University
 
-irods_uu_microservices_package_old: irods-uu-microservices-4.2.11_0.8.2-1
-irods_sudo_microservices_package_old: irods-sudo-microservices-4.2.11_1.0.0-1
-irods_runtime_package_old: irods-runtime-4.2.11-1
-irods_server_package_old: irods-server-4.2.11-1
-irods_icommands_package_old: irods-icommands-4.2.11-1
-irods_prep_package_old: irods-rule-engine-plugin-python-4.2.11.1-1
-irods_pgp_package_old: irods-database-plugin-postgres-4.2.11-1
-irods_idp_package_old: irods-rule-engine-plugin-indexing-4.2.11.0-1
-irods_esp_package_old: irods-rule-engine-plugin-elasticsearch-4.2.11.0-1
-irods_dtp_package_old: irods-rule-engine-plugin-document-type-4.2.11.0-1
-irods_davrods_package_old: davrods-4.2.11_1.5.0-1
+irods_uu_microservices_package_old: irods-uu-microservices-4.2.12-1.2.0-0
+irods_sudo_microservices_package_old: irods-sudo-microservices-4.2.12_1.0.0-1
+irods_runtime_package_old: irods-runtime-4.2.12-1
+irods_server_package_old: irods-server-4.2.12-1
+irods_icommands_package_old: irods-icommands-4.2.12-1
+irods_prep_package_old: irods-rule-engine-plugin-python-4.2.12.0-1
+irods_pgp_package_old: irods-database-plugin-postgres-4.2.12-1
+irods_idp_package_old: irods-rule-engine-plugin-indexing-4.2.12.0-1
+irods_esp_package_old: irods-rule-engine-plugin-elasticsearch-4.2.12.0-1
+irods_dtp_package_old: irods-rule-engine-plugin-document-type-4.2.12.0-1
+irods_davrods_package_old: davrods-4.2.12_1.5.1-1
diff --git a/roles/irods_resource/meta/main.yml b/roles/irods_resource/meta/main.yml
@@ -8,15 +8,15 @@ galaxy_info:
   min_ansible_version: '2.11'
   platforms:
     - name: EL
-      version: 7
+      version: 8
     - name: Ubuntu
-      version: focal
+      version: jammy
 
 
 dependencies:
   - role: irods_ubuntu_dependencies
     when: ansible_os_family == 'Debian'
   - role: irods_remove_old_version
   - role: irods_icommands
-  - role: python2
+  - role: python3
   - role: python_irodsclient
diff --git a/roles/irods_resource/vars/Debian.yml b/roles/irods_resource/vars/Debian.yml
@@ -4,6 +4,6 @@
 openssl_private_dir: '/etc/ssl/private/'
 openssl_certs_dir: '/etc/ssl/certs'
 
-irods_runtime_package_new: irods-runtime=4.2.12-1~bionic
-irods_server_package_new: irods-server=4.2.12-1~bionic
-irods_prep_package_new: irods-rule-engine-plugin-python=4.2.12.0-1~bionic
+irods_runtime_package_new: irods-runtime=4.3.3-0~jammy
+irods_server_package_new: irods-server=4.3.3-0~jammy
+irods_prep_package_new: irods-rule-engine-plugin-python=4.3.3.0-0~jammy
diff --git a/roles/irods_resource/vars/RedHat.yml b/roles/irods_resource/vars/RedHat.yml
@@ -4,6 +4,6 @@
 openssl_private_dir: '/etc/pki/tls/private'
 openssl_certs_dir: '/etc/pki/tls/certs'
 
-irods_runtime_package_new: irods-runtime-4.2.12-1
-irods_server_package_new: irods-server-4.2.12-1
-irods_prep_package_new: irods-rule-engine-plugin-python-4.2.12.0-1
+irods_runtime_package_new: irods-runtime-4.3.3-0
+irods_server_package_new: irods-server-4.3.3-0
+irods_prep_package_new: irods-rule-engine-plugin-python-4.3.3.0-0
diff --git a/roles/irods_resource_plugin_s3/meta/main.yml b/roles/irods_resource_plugin_s3/meta/main.yml
@@ -8,9 +8,9 @@ galaxy_info:
   min_ansible_version: '2.11'
   platforms:
     - name: EL
-      version: 7
+      version: 8
     - name: Ubuntu
-      version: focal
+      version: jammy
 
 
 dependencies:

diff --git a/roles/irods_resource_plugin_s3/vars/Debian.yml b/roles/irods_resource_plugin_s3/vars/Debian.yml
@@ -1,4 +1,4 @@
 ---
 # copyright Utrecht University
 
-irods_resource_plugin_s3_package: irods-resource-plugin-s3=4.2.12.0-1~bionic
+irods_resource_plugin_s3_package: irods-resource-plugin-s3=4.3.3.0-0~jammy
diff --git a/roles/irods_resource_plugin_s3/vars/RedHat.yml b/roles/irods_resource_plugin_s3/vars/RedHat.yml
@@ -1,4 +1,4 @@
 ---
 # copyright Utrecht University
 #
-irods_resource_plugin_s3_package: irods-resource-plugin-s3-4.2.12.0-1
+irods_resource_plugin_s3_package: irods-resource-plugin-s3-4.3.3.0-0
diff --git a/roles/irods_runtime/meta/main.yml b/roles/irods_runtime/meta/main.yml
@@ -8,9 +8,9 @@ galaxy_info:
   min_ansible_version: '2.11'
   platforms:
     - name: EL
-      version: 7
+      version: 8
     - name: Ubuntu
-      version: focal
+      version: jammy
 
 
 dependencies:

diff --git a/roles/irods_runtime/tasks/main-tasks.yml b/roles/irods_runtime/tasks/main-tasks.yml
@@ -29,21 +29,21 @@
   when: ansible_os_family == 'Debian'
 
 
-- name: Determine current checksum of irods_server library
-  ansible.builtin.command: "sha256sum /usr/lib/libirods_server.so.4.2.12"
-  register: libirods_server_checksum
-  changed_when: false
-
-
-- name: Install local patch for iRODS 4.2.12
-  ansible.builtin.get_url:
-    url: "{{ irods_runtime_server_patch_url }}"
-    dest: /usr/lib/libirods_server.so.4.2.12
-    checksum: "sha256:{{ irods_runtime_server_patch_sha256sum }}"
-    owner: 'root'
-    group: 'root'
-    mode: '0644'
-    force: true
-    backup: true
-  notify: Restart iRODS
-  when: not ansible_check_mode and libirods_server_checksum.stdout.split()[0] != irods_runtime_server_patch_sha256sum
+# - name: Determine current checksum of irods_server library
+#   ansible.builtin.command: "sha256sum /usr/lib/libirods_server.so.4.2.12"
+#   register: libirods_server_checksum
+#   changed_when: false
+
+
+# - name: Install local patch for iRODS 4.2.12
+#   ansible.builtin.get_url:
+#     url: "{{ irods_runtime_server_patch_url }}"
+#     dest: /usr/lib/libirods_server.so.4.2.12
+#     checksum: "sha256:{{ irods_runtime_server_patch_sha256sum }}"
+#     owner: 'root'
+#     group: 'root'
+#     mode: '0644'
+#     force: true
+#     backup: true
+#   notify: Restart iRODS
+#   when: not ansible_check_mode and libirods_server_checksum.stdout.split()[0] != irods_runtime_server_patch_sha256sum
diff --git a/roles/irods_runtime/vars/Debian.yml b/roles/irods_runtime/vars/Debian.yml
@@ -1,6 +1,6 @@
 ---
 # copyright Utrecht University
 
-irods_runtime_package_new: irods-runtime=4.2.12-1~bionic
-irods_runtime_server_patch_url: https://yoda.uu.nl/irods-patches/libirods_server.so.4.2.12.ubuntu2004
-irods_runtime_server_patch_sha256sum: 44b656e07954d41fc36a23400101690a5b7c150aa3ab8887b3df24b338525e9c
+irods_runtime_package_new: irods-runtime=4.3.3-0~jammy
+# irods_runtime_server_patch_url: https://yoda.uu.nl/irods-patches/libirods_server.so.4.2.12.ubuntu2004
+# irods_runtime_server_patch_sha256sum: 44b656e07954d41fc36a23400101690a5b7c150aa3ab8887b3df24b338525e9c
diff --git a/roles/irods_runtime/vars/RedHat.yml b/roles/irods_runtime/vars/RedHat.yml
@@ -1,6 +1,6 @@
 ---
 # copyright Utrecht University
 
-irods_runtime_package_new: irods-runtime-4.2.12-1
-irods_runtime_server_patch_url: https://yoda.uu.nl/irods-patches/libirods_server.so.4.2.12
-irods_runtime_server_patch_sha256sum: 11bb77ff1f17faac1052b891cf6d75a0f55a55814a4ecbad53e1469aca96c1d2
+irods_runtime_package_new: irods-runtime-4.3.3-0
+# irods_runtime_server_patch_url: https://yoda.uu.nl/irods-patches/libirods_server.so.4.2.12
+# irods_runtime_server_patch_sha256sum: 11bb77ff1f17faac1052b891cf6d75a0f55a55814a4ecbad53e1469aca96c1d2