Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump server to 5.6.11 and incl ZarrReader #420

Closed
wants to merge 2 commits into from
Closed

Bump server to 5.6.11 and incl ZarrReader #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3b470c
Revert "Revert OMERO.server upgrade for prod120"
dominikl Apr 11, 2024
2bffec7
Update omero-server to latest version
dominikl May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 1 addition & 27 deletions ansible/group_vars/omero-hosts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.11
omero_server_checkupgrade_comparator: '!='

idr_omero_web_release: 5.25.0
Expand All @@ -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
Expand Down
10 changes: 4 additions & 6 deletions ansible/idr-omero-readonly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions ansible/idr-omero.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading