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.

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

[pull] master from ome:master #38

Merged
merged 5 commits into from
Nov 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
@@ -1,6 +1,6 @@
# Install OMERO.server and prepare the OME (UoD/SLS) prerequisites

- name: Dundeeomero server aka nightshade

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (bootstrap)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (ome-demoserver)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (web-proxy)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (release)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (nightshade-webclients)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (www)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (docker-prod)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (ome-dundeeomero)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (omero-training-server)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (ome-demoserver)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (web-proxy)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (bootstrap)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (release)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (nightshade-webclients)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (www)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (ome-dundeeomero)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (docker-prod)

3:1 [document-start] missing document start "---"

Check warning on line 3 in omero/ome-dundeeomero.yml

View workflow job for this annotation

GitHub Actions / Test (omero-training-server)

3:1 [document-start] missing document start "---"
hosts: ome-dundeeomero.openmicroscopy.org
pre_tasks:
- name: Install open-vm-tools if system is a VMware vm
Expand Down 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 @@ -9,10 +9,10 @@
- name: Install Make Movie script Prerequisite | MEncoder - Repo
become: yes
yum:
name: http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (bootstrap)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (bootstrap)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-demoserver)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-demoserver)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (web-proxy)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (web-proxy)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (release)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (release)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (nightshade-webclients)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (nightshade-webclients)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (www)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (www)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (docker-prod)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (docker-prod)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-dundeeomero)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-dundeeomero)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (omero-training-server)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (omero-training-server)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-demoserver)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-demoserver)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (web-proxy)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (web-proxy)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (bootstrap)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (bootstrap)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (release)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (release)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (nightshade-webclients)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (nightshade-webclients)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (www)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (www)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-dundeeomero)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-dundeeomero)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (docker-prod)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (docker-prod)

12:81 [line-length] line too long (104 > 80 characters)

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (omero-training-server)

12:15 [colons] too many spaces after colon

Check failure on line 12 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (omero-training-server)

12:81 [line-length] line too long (104 > 80 characters)
state: present

- name: OMERO.figure server-side prerequisites, script prerequisites + web server for decoupled OMERO.web

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (bootstrap)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-demoserver)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (web-proxy)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (release)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (nightshade-webclients)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (www)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (docker-prod)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-dundeeomero)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (omero-training-server)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-demoserver)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (web-proxy)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (bootstrap)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (release)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (nightshade-webclients)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (www)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-dundeeomero)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (docker-prod)

15:81 [line-length] line too long (109 > 80 characters)

Check failure on line 15 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (omero-training-server)

15:81 [line-length] line too long (109 > 80 characters)
become: yes
yum:
name: "{{ item }}"
Expand All @@ -31,7 +31,7 @@
- gcc
- python-ldap

# Since Nginx isn't installed until later the directories are created in advance

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (bootstrap)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-demoserver)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (web-proxy)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (release)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (nightshade-webclients)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (www)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (docker-prod)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-dundeeomero)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (omero-training-server)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-demoserver)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (web-proxy)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (bootstrap)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (release)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (nightshade-webclients)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (www)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (ome-dundeeomero)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (docker-prod)

34:81 [line-length] line too long (84 > 80 characters)

Check failure on line 34 in omero/training-server/playbook.yml

View workflow job for this annotation

GitHub Actions / Test (omero-training-server)

34:81 [line-length] line too long (84 > 80 characters)
- name: Create nginx include directories
become: yes
file:
Expand Down 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
Loading