Merge pull request #380 from sbesson/OMERO.server_5.6.5

Deploy OMERO.server 5.6.9 on pilot IDR instance

Author: sbesson

ansible/group_vars/omero-hosts.yml

@@ -6,9 +6,7 @@
 ######################################################################
 # Shared variables
 
-# Force a downgrade from 5.6.1
-# https://github.com/ome/omero-server/issues/93
-idr_omero_server_release: 5.6.0
+idr_omero_server_release: 5.6.9
 omero_server_checkupgrade_comparator: '!='
 
 idr_omero_web_release: 5.21.0
@@ -22,30 +20,6 @@ idr_omero_web_release: 5.21.0
 
 artifactory_baseurl: "https://artifacts.openmicroscopy.org/artifactory/maven"
 
-# Override the lib/client JARs on the omeroreadwrite server
-# Works around the OMERO.server 5.6.3 upgrade issue - to be reverted when
-# the server is upgraded
-# See https://github.com/IDR/deployment/issues/327
-omero_client_jars:
-  - name: omero-romio
-    group: org/openmicroscopy
-    version: "5.6.2"
-  - name: omero-blitz
-    group: org/openmicroscopy
-    version: "5.5.8"
-
-# The IDR OMERO server uses a custom IDR build
-idr_bf_jars:
-  - name: formats-api
-    group: idr
-    version: "0.6.10"
-  - name: formats-bsd
-    group: idr
-    version: "0.6.10"
-  - name: formats-gpl
-    group: idr
-    version: "0.6.10"
-
 ice_install_devel: false
 ice_install_python: false
 # If you're using a CI build you might need to disable omego SSL verification

ansible/idr-omero-readonly.yml

@@ -208,19 +208,17 @@
     - name: Override lib/server JARs
       become: yes
       get_url:
-        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"
+        url: "{{ artifactory_baseurl }}/ome/OMEZarrReader/0.3.1/OMEZarrReader-0.3.1.jar"
+        dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/server/OMEZarrReader.jar"
         force: yes
-      with_items: "{{ idr_bf_jars }}"
       notify: restart omero-server
 
     - name: Override lib/client JARs
       become: yes
       get_url:
-        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"
+        url: "{{ artifactory_baseurl }}/ome/OMEZarrReader/0.3.1/OMEZarrReader-0.3.1.jar"
+        dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/client/OMEZarrReader.jar"
         force: yes
-      with_items: "{{ omero_client_jars + idr_bf_jars }}"
       notify: restart omero-server
 
     - name: Remove OMERO scripts

ansible/idr-omero.yml

@@ -79,19 +79,17 @@
     - name: Override lib/server JARs
       become: yes
       get_url:
-        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"
+        url: "{{ artifactory_baseurl }}/ome/OMEZarrReader/0.3.1/OMEZarrReader-0.3.1.jar"
+        dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/server/OMEZarrReader.jar"
         force: yes
-      with_items: "{{ idr_bf_jars }}"
       notify: restart omero-server
 
     - name: Override lib/client JARs
       become: yes
       get_url:
-        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"
+        url: "{{ artifactory_baseurl }}/ome/OMEZarrReader/0.3.1/OMEZarrReader-0.3.1.jar"
+        dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/client/OMEZarrReader.jar"
         force: yes
-      with_items: "{{ omero_client_jars + idr_bf_jars }}"
       notify: restart omero-server
 
     - name: Remove OMERO scripts