Load zarrreader_jars, including OMEZarrReader-0.5.1 from maven

will-moore · Jun 20, 2024 · 9e846b4 · 9e846b4
1 parent f588960
commit 9e846b4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml
@@ -19,10 +19,9 @@ idr_omero_web_release: 5.25.0
 # _omero_py_version: ==5.9.0
 
 artifactory_baseurl: "https://artifacts.openmicroscopy.org/artifactory/maven"
-maven_central_baseurl: "https://repo1.maven.org/maven2"
 
 # list from https://github.com/IDR/deployment/pull/420#issuecomment-2173437956
-omero_client_jars:
+zarrreader_jars:
   - name: aws-java-sdk-s3
     group: com/amazonaws
     version: "1.12.659"
@@ -47,6 +46,9 @@ omero_client_jars:
   - name: jackson-dataformat-cbor
     group: com/fasterxml/jackson/dataformat
     version: "2.12.6"
+  - name: OMEZarrReader
+    group: ome
+    version: "0.5.1"
 
 ice_install_devel: false
 ice_install_python: false

diff --git a/ansible/idr-omero-readonly.yml b/ansible/idr-omero-readonly.yml
@@ -208,17 +208,19 @@
     - name: Override lib/server JARs
       become: yes
       get_url:
-        url: "{{ artifactory_baseurl }}/ome/OMEZarrReader/0.4.0/OMEZarrReader-0.4.0.jar"
-        dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/server/OMEZarrReader.jar"
+        url: "{{ artifactory_baseurl }}/{{ item.group }}/{{ item.name }}/{{ item.version }}/{{ item.name }}-{{ item.version }}.jar"
+        dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/server/{{ item.name }}.jar"
         force: yes
+      with_items: "{{ zarrreader_jars }}"
       notify: restart omero-server
 
     - name: Override lib/client JARs
       become: yes
       get_url:
-        url: "{{ artifactory_baseurl }}/ome/OMEZarrReader/0.4.0/OMEZarrReader-0.4.0.jar"
-        dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/client/OMEZarrReader.jar"
+        url: "{{ artifactory_baseurl }}/{{ item.group }}/{{ item.name }}/{{ item.version }}/{{ item.name }}-{{ item.version }}.jar"
+        dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/client/{{ item.name }}.jar"
         force: yes
+      with_items: "{{ zarrreader_jars }}"
       notify: restart omero-server
 
     - name: Remove OMERO scripts

diff --git a/ansible/idr-omero.yml b/ansible/idr-omero.yml
@@ -78,17 +78,19 @@
     - name: Override lib/server JARs
       become: yes
       get_url:
-        url: "{{ artifactory_baseurl }}/ome/OMEZarrReader/0.5.1/OMEZarrReader-0.5.1.jar"
-        dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/server/OMEZarrReader.jar"
+        url: "{{ artifactory_baseurl }}/{{ item.group }}/{{ item.name }}/{{ item.version }}/{{ item.name }}-{{ item.version }}.jar"
+        dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/server/{{ item.name }}.jar"
         force: yes
+      with_items: "{{ zarrreader_jars }}"
       notify: restart omero-server
 
     - name: Override lib/client JARs
       become: yes
       get_url:
-        url: "{{ artifactory_baseurl }}/ome/OMEZarrReader/0.5.1/OMEZarrReader-0.5.1.jar"
-        dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/client/OMEZarrReader.jar"
+        url: "{{ artifactory_baseurl }}/{{ item.group }}/{{ item.name }}/{{ item.version }}/{{ item.name }}-{{ item.version }}.jar"
+        dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/client/{{ item.name }}.jar"
         force: yes
+      with_items: "{{ zarrreader_jars }}"
       notify: restart omero-server
 
     - name: Remove OMERO scripts