Skip to content

Commit

Permalink
Merge pull request ome#373 from pwalczysko/upgrade
Browse files Browse the repository at this point in the history
Upgrade server, web and web apps
  • Loading branch information
pwalczysko authored Nov 3, 2023
2 parents dba8d16 + b0b71ea commit 3f203ef
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions omero/learning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@

vars:
postgresql_version: "13"
omero_server_release: 5.6.6
omero_web_release: 5.16.0
omero_server_release: 5.6.8
omero_web_release: 5.22.1
omero_py_release: "{{ omero_py_release_override | default('5.13.1') }}"
omero_web_apps_release:
omero_gallery: 3.4.2
Expand Down
12 changes: 6 additions & 6 deletions omero/nightshade-webclients.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,16 @@
(omero_web_config_set_for_host | default({})))
}}
omero_web_release: "{{ omero_web_release_override | default('5.16.0') }}"
omero_py_release: "{{ omero_py_release_override | default('5.13.1') }}"
omero_web_release: "{{ omero_web_release_override | default('5.22.1') }}"
omero_py_release: "{{ omero_py_release_override | default('5.15.0') }}"
omero_figure_release: >-
{{ omero_figure_release_override | default('5.1.0') }}
{{ omero_figure_release_override | default('6.0.1') }}
omero_fpbioimage_release: >-
{{ omero_fpbioimage_release_override | default('0.4.0') }}
{{ omero_fpbioimage_release_override | default('0.4.1') }}
omero_iviewer_release: >-
{{ omero_iviewer_release_override | default('0.12.0') }}
{{ omero_iviewer_release_override | default('0.13.0') }}
omero_parade_release: >-
{{ omero_parade_release_override | default('0.2.3') }}
{{ omero_parade_release_override | default('0.2.4') }}
omero_webtagging_autotag_release: >-
{{ omero_webtagging_autotag_release_override | default('3.2.0') }}
omero_webtagging_tagsearch_release: >-
Expand Down
16 changes: 8 additions & 8 deletions omero/ome-demoserver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -332,15 +332,15 @@

vars:
omero_figure_release: >-
{{ omero_figure_release_override | default('5.1.0') }}
{{ omero_figure_release_override | default('6.0.1') }}
omero_figure_script_release: >-
{{ omero_figure_script_release_override | default('v5.1.0') }}
{{ omero_figure_script_release_override | default('v6.0.1') }}
omero_fpbioimage_release: >-
{{ omero_fpbioimage_release_override | default('0.4.0') }}
{{ omero_fpbioimage_release_override | default('0.4.1') }}
omero_iviewer_release: >-
{{ omero_iviewer_release_override | default('0.12.0') }}
{{ omero_iviewer_release_override | default('0.13.0') }}
omero_parade_release: >-
{{ omero_parade_release_override | default('0.2.3') }}
{{ omero_parade_release_override | default('0.2.4') }}
omero_webtagging_autotag_release: >-
{{ omero_webtagging_autotag_release_override | default('3.2.0') }}
omero_webtagging_tagsearch_release: >-
Expand All @@ -349,9 +349,9 @@
{{ omero_signup_release_override | default('0.3.2') }}
omero_server_release: >-
{{ omero_server_release_override | default('5.6.6') }}
omero_web_release: "{{ omero_web_release_override | default('5.16.0') }}"
omero_py_release: "{{ omero_py_release_override | default('5.13.1') }}"
{{ omero_server_release_override | default('5.6.8') }}
omero_web_release: "{{ omero_web_release_override | default('5.22.1') }}"
omero_py_release: "{{ omero_py_release_override | default('5.15.0') }}"
# For https://github.com/openmicroscopy/ansible-role-java,
# which is a dependency.
java_jdk_install: true
Expand Down
6 changes: 3 additions & 3 deletions omero/ome-dundeeomero.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
# Note - had to have these set to `install-mock` to progress role
# installation before changing config to restored DB from other system.
- role: ome.omero_server
omero_server_release: 5.6.6
omero_server_release: 5.6.8
omero_server_datadir_manage: "{{ molecule_test | default(False) }}"
omero_server_systemd_limit_nofile: 16384
omero_server_systemd_after: >-
Expand Down Expand Up @@ -229,8 +229,8 @@
postgresql_version: "11"
filesystem: "xfs"
omero_figure_release: >-
{{ omero_figure_release_override | default('5.1.0') }}
omero_py_release: "{{ omero_py_release_override | default('5.13.1') }}"
{{ omero_figure_release_override | default('6.0.1') }}
omero_py_release: "{{ omero_py_release_override | default('5.15.0') }}"

omero_server_config_set_production:
omero.db.poolsize: 60
Expand Down
14 changes: 7 additions & 7 deletions omero/training-server/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -440,14 +440,14 @@
omero_server_system_managedrepo_group: managed_repo_group
omero_server_datadir_managedrepo_mode: u=rwX,g=srwX,o=rX,+t
omero_server_datadir_chown: False
omero_server_release: "{{ omero_server_release_override | default('5.6.6') }}"
omero_web_release: "{{ omero_web_release_override | default('5.16.0') }}"
omero_figure_release: "{{ omero_figure_release_override | default('5.1.0') }}"
omero_fpbioimage_release: "{{ omero_fpbioimage_release_override | default('0.4.0') }}"
omero_iviewer_release: "{{ omero_iviewer_release_override | default('0.12.0') }}"
omero_server_release: "{{ omero_server_release_override | default('5.6.8') }}"
omero_web_release: "{{ omero_web_release_override | default('5.22.1') }}"
omero_figure_release: "{{ omero_figure_release_override | default('6.0.1') }}"
omero_fpbioimage_release: "{{ omero_fpbioimage_release_override | default('0.4.1') }}"
omero_iviewer_release: "{{ omero_iviewer_release_override | default('0.13.0') }}"
omero_mapr_release: "{{ omero_mapr_release_override | default('0.5.0') }}"
omero_parade_release: "{{ omero_parade_release_override | default('0.2.3') }}"
omero_py_release: "{{ omero_py_release_override | default('5.13.1') }}"
omero_parade_release: "{{ omero_parade_release_override | default('0.2.4') }}"
omero_py_release: "{{ omero_py_release_override | default('5.15.0') }}"

# The omero_web_apps_* vars are used by the ome.omero_web role under
# Python 3 otherwise ignored
Expand Down
2 changes: 1 addition & 1 deletion requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
version: 1.2.0

- name: ome.omero_prometheus_exporter
version: 0.3.3
version: 0.3.6

- name: ome.omero_server
version: 4.0.2
Expand Down

0 comments on commit 3f203ef

Please sign in to comment.