Skip to content

Commit

Permalink
Revert OMERO.server upgrade for prod120
Browse files Browse the repository at this point in the history
The decision of the weekly IDR meeting was to recreate prod120 using
the current software stack, using the IDR fork of Bio-Formats and
get more confidence into the software upgrade before deploying it
to production
  • Loading branch information
sbesson committed Feb 26, 2024
1 parent 825c70b commit 3876a0f
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 9 deletions.
28 changes: 27 additions & 1 deletion ansible/group_vars/omero-hosts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
######################################################################
# Shared variables

idr_omero_server_release: 5.6.9
# Force a downgrade from 5.6.1
# https://github.com/ome/omero-server/issues/93
idr_omero_server_release: 5.6.0
omero_server_checkupgrade_comparator: '!='

idr_omero_web_release: 5.21.0
Expand All @@ -20,6 +22,30 @@ 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
Expand Down
10 changes: 6 additions & 4 deletions ansible/idr-omero-readonly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: "{{ idr_bf_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: "{{ omero_client_jars + idr_bf_jars }}"
notify: restart omero-server

- name: Remove OMERO scripts
Expand Down
10 changes: 6 additions & 4 deletions ansible/idr-omero.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,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: "{{ idr_bf_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: "{{ omero_client_jars + idr_bf_jars }}"
notify: restart omero-server

- name: Remove OMERO scripts
Expand Down

0 comments on commit 3876a0f

Please sign in to comment.