Skip to content

Commit f7e8bb9

Browse files
authored
Merge pull request #447 from dominikl/omero_zarr_pixel_buffer
Add omero-zarr-pixel-buffer to deployment
2 parents 01ab6a3 + 2d26d86 commit f7e8bb9

File tree

3 files changed

+57
-2
lines changed

3 files changed

+57
-2
lines changed

ansible/group_vars/omero-hosts.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ idr_omero_web_release: 5.26.0
1919
# _omero_py_version: ==5.9.0
2020

2121
artifactory_baseurl: "https://artifacts.openmicroscopy.org/artifactory/maven"
22+
glencoe_artifactory_baseurl: "https://artifacts.glencoesoftware.com/artifactory/gs-omero-snapshots-local"
23+
maven_artifactory_url: "https://repo1.maven.org/maven2"
2224

2325
# list from https://github.com/IDR/deployment/pull/420#issuecomment-2173437956
2426
zarrreader_jars:
@@ -50,6 +52,25 @@ zarrreader_jars:
5052
group: ome
5153
version: "0.5.2"
5254

55+
zarrpixelbuffer_jars:
56+
- name: omero-zarr-pixel-buffer
57+
group: com/glencoesoftware/omero
58+
version: "0.4.1"
59+
60+
zarrpixelbuffer_dep_jars:
61+
- name: caffeine
62+
group: com/github/ben-manes/caffeine
63+
version: "3.1.8"
64+
- name: jzarr
65+
group: dev/zarr
66+
version: "0.4.2"
67+
- name: s3fs
68+
group: org/lasersonlab
69+
version: "2.2.3"
70+
- name: aws-java-sdk-s3
71+
group: com/amazonaws
72+
version: "1.12.659"
73+
5374
ice_install_devel: false
5475
ice_install_python: false
5576
# If you're using a CI build you might need to disable omego SSL verification

ansible/idr-omero-readonly.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,23 @@
223223
with_items: "{{ zarrreader_jars }}"
224224
notify: restart omero-server
225225

226+
- name: Override lib/server JARs (omero-zarr-pixel-buffer)
227+
become: yes
228+
get_url:
229+
url: "{{ glencoe_artifactory_baseurl }}/{{ item.group }}/{{ item.name }}/{{ item.version }}/{{ item.name }}-{{ item.version }}.jar"
230+
dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/server/{{ item.name }}.jar"
231+
force: yes
232+
with_items: "{{ zarrpixelbuffer_jars }}"
233+
234+
- name: Override lib/server JARs (dependencies of omero-zarr-pixel-buffer)
235+
become: yes
236+
get_url:
237+
url: "{{ maven_artifactory_url }}/{{ item.group }}/{{ item.name }}/{{ item.version }}/{{ item.name }}-{{ item.version }}.jar"
238+
dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/server/{{ item.name }}.jar"
239+
force: yes
240+
with_items: "{{ zarrpixelbuffer_dep_jars }}"
241+
notify: restart omero-server
242+
226243
- name: Remove OMERO scripts
227244
become: yes
228245
file:

ansible/idr-omero.yml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
force: yes
7676
notify: restart omero-server
7777

78-
- name: Override lib/server JARs
78+
- name: Override lib/server JARs (OMEZarrReader)
7979
become: yes
8080
get_url:
8181
url: "{{ artifactory_baseurl }}/{{ item.group }}/{{ item.name }}/{{ item.version }}/{{ item.name }}-{{ item.version }}.jar"
@@ -84,7 +84,7 @@
8484
with_items: "{{ zarrreader_jars }}"
8585
notify: restart omero-server
8686

87-
- name: Override lib/client JARs
87+
- name: Override lib/client JARs (OMEZarrReader)
8888
become: yes
8989
get_url:
9090
url: "{{ artifactory_baseurl }}/{{ item.group }}/{{ item.name }}/{{ item.version }}/{{ item.name }}-{{ item.version }}.jar"
@@ -93,6 +93,23 @@
9393
with_items: "{{ zarrreader_jars }}"
9494
notify: restart omero-server
9595

96+
- name: Override lib/server JARs (omero-zarr-pixel-buffer)
97+
become: yes
98+
get_url:
99+
url: "{{ glencoe_artifactory_baseurl }}/{{ item.group }}/{{ item.name }}/{{ item.version }}/{{ item.name }}-{{ item.version }}.jar"
100+
dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/server/{{ item.name }}.jar"
101+
force: yes
102+
with_items: "{{ zarrpixelbuffer_jars }}"
103+
104+
- name: Override lib/server JARs (dependencies of omero-zarr-pixel-buffer)
105+
become: yes
106+
get_url:
107+
url: "{{ maven_artifactory_url }}/{{ item.group }}/{{ item.name }}/{{ item.version }}/{{ item.name }}-{{ item.version }}.jar"
108+
dest: "{{ omero_common_basedir }}/server/OMERO.server/lib/server/{{ item.name }}.jar"
109+
force: yes
110+
with_items: "{{ zarrpixelbuffer_dep_jars }}"
111+
notify: restart omero-server
112+
96113
- name: Remove OMERO scripts
97114
become: yes
98115
file:

0 commit comments

Comments
 (0)