From c0f6ec39cbbfc8c3b346179a79493cf44955f816 Mon Sep 17 00:00:00 2001 From: pwalczysko Date: Mon, 7 Aug 2023 12:06:42 +0100 Subject: [PATCH 1/4] Upgrade server, web and web apps --- omero/learning.yml | 4 ++-- omero/nightshade-webclients.yml | 10 +++++----- omero/ome-demoserver.yml | 14 +++++++------- omero/ome-dundeeomero.yml | 6 +++--- omero/training-server/playbook.yml | 14 +++++++------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/omero/learning.yml b/omero/learning.yml index a5f268b6..afa4dc74 100644 --- a/omero/learning.yml +++ b/omero/learning.yml @@ -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 diff --git a/omero/nightshade-webclients.yml b/omero/nightshade-webclients.yml index 7df479ef..dc590ed4 100644 --- a/omero/nightshade-webclients.yml +++ b/omero/nightshade-webclients.yml @@ -109,14 +109,14 @@ (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_webtagging_autotag_release: >- diff --git a/omero/ome-demoserver.yml b/omero/ome-demoserver.yml index a4b52255..298de3aa 100644 --- a/omero/ome-demoserver.yml +++ b/omero/ome-demoserver.yml @@ -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_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: >- @@ -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 diff --git a/omero/ome-dundeeomero.yml b/omero/ome-dundeeomero.yml index 65893b43..7ec07097 100644 --- a/omero/ome-dundeeomero.yml +++ b/omero/ome-dundeeomero.yml @@ -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: >- @@ -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 diff --git a/omero/training-server/playbook.yml b/omero/training-server/playbook.yml index 622fb50a..353899bc 100644 --- a/omero/training-server/playbook.yml +++ b/omero/training-server/playbook.yml @@ -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 From 5c691939c015158078fd36d3be56edd715954a88 Mon Sep 17 00:00:00 2001 From: pwalczysko Date: Mon, 7 Aug 2023 22:30:38 +0100 Subject: [PATCH 2/4] Fix figure script on demo --- omero/ome-demoserver.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omero/ome-demoserver.yml b/omero/ome-demoserver.yml index 298de3aa..ea506174 100644 --- a/omero/ome-demoserver.yml +++ b/omero/ome-demoserver.yml @@ -334,7 +334,7 @@ omero_figure_release: >- {{ 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.1') }} omero_iviewer_release: >- From d6febbe5a761b5819e53b5d897f9db2329792960 Mon Sep 17 00:00:00 2001 From: pwalczysko Date: Thu, 14 Sep 2023 12:23:00 +0100 Subject: [PATCH 3/4] Also bump parade on ns --- omero/nightshade-webclients.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omero/nightshade-webclients.yml b/omero/nightshade-webclients.yml index dc590ed4..10542e21 100644 --- a/omero/nightshade-webclients.yml +++ b/omero/nightshade-webclients.yml @@ -118,7 +118,7 @@ omero_iviewer_release: >- {{ 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: >- From b0b71ea6644ccc10004dc92c059009691fe45624 Mon Sep 17 00:00:00 2001 From: pwalczysko Date: Wed, 1 Nov 2023 10:16:39 +0000 Subject: [PATCH 4/4] Bump prometheus exporter version aka https://github.com/IDR/deployment/pull/412/files --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 36cd3b78..a1759a69 100644 --- a/requirements.yml +++ b/requirements.yml @@ -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