From c3b470c39ac94b19b69b20118b3dc19992942f6d Mon Sep 17 00:00:00 2001 From: Dominik Lindner Date: Thu, 11 Apr 2024 12:57:04 +0100 Subject: [PATCH 1/2] Revert "Revert OMERO.server upgrade for prod120" This reverts commit 3876a0fc477c4021f6281bbf19967b886b6ee854. --- ansible/group_vars/omero-hosts.yml | 28 +--------------------------- ansible/idr-omero-readonly.yml | 10 ++++------ ansible/idr-omero.yml | 10 ++++------ 3 files changed, 9 insertions(+), 39 deletions(-) diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml index 525e2505..7a5de9c8 100644 --- a/ansible/group_vars/omero-hosts.yml +++ b/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.25.0 @@ -22,30 +20,6 @@ idr_omero_web_release: 5.25.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 diff --git a/ansible/idr-omero-readonly.yml b/ansible/idr-omero-readonly.yml index f40df49f..710226ad 100644 --- a/ansible/idr-omero-readonly.yml +++ b/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.4.0/OMEZarrReader-0.4.0.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.4.0/OMEZarrReader-0.4.0.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 diff --git a/ansible/idr-omero.yml b/ansible/idr-omero.yml index 053fae81..ceaa0090 100644 --- a/ansible/idr-omero.yml +++ b/ansible/idr-omero.yml @@ -78,19 +78,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.4.0/OMEZarrReader-0.4.0.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.4.0/OMEZarrReader-0.4.0.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 From 2bffec74c4af96328f1b2556e80ac3e43ce05fc2 Mon Sep 17 00:00:00 2001 From: Dominik Lindner Date: Mon, 13 May 2024 10:50:48 +0100 Subject: [PATCH 2/2] Update omero-server to latest version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sébastien Besson --- ansible/group_vars/omero-hosts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml index 7a5de9c8..048c2e5d 100644 --- a/ansible/group_vars/omero-hosts.yml +++ b/ansible/group_vars/omero-hosts.yml @@ -6,7 +6,7 @@ ###################################################################### # Shared variables -idr_omero_server_release: 5.6.9 +idr_omero_server_release: 5.6.11 omero_server_checkupgrade_comparator: '!=' idr_omero_web_release: 5.25.0