Merge pull request #413 from sbesson/rocky9

Rocky Linux 9 IDR upgrade
IDR · Apr 10, 2024 · ed5e0f4 · ed5e0f4
2 parents 207f862 + 8fe59d9
commit ed5e0f4
Show file tree

Hide file tree

Showing 13 changed files with 105 additions and 178 deletions.
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -8,7 +8,7 @@ on:
 jobs:
 
   list-scenarios:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       matrix: ${{ steps.listscenarios.outputs.scenarios }}
     steps:
@@ -22,7 +22,7 @@ jobs:
     name: Test
     needs:
       - list-scenarios
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       # Keep running so we can see if other tests pass
       fail-fast: false

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
@@ -1,2 +1,3 @@
 upgrade_distpackages_excludes:
 - "docker*"
+iptables_raw_disable_firewalld: False
diff --git a/ansible/group_vars/omero-hosts.yml b/ansible/group_vars/omero-hosts.yml
@@ -11,7 +11,7 @@
 idr_omero_server_release: 5.6.0
 omero_server_checkupgrade_comparator: '!='
 
-idr_omero_web_release: 5.21.0
+idr_omero_web_release: 5.25.0
 # omero-web depends on omero-py but may not pin the latest release
 # omero_web_python_addons:
 #   - omero-py==5.9.0
@@ -83,11 +83,10 @@ omero_server_datadir_bioformatscache: /data/BioFormatsCache
 omero_server_systemd_limit_nofile: 16384
 
 omero_server_python_addons:
-- omero-cli-render==0.7.0
-- omero-metadata==0.9.0
+- omero-cli-render==0.8.0
+- omero-metadata==0.12.0
 - omero-upload==0.4.0
 - omero-rois==0.3.0
-- pandas==1.1.0
 
 omero_server_config_set:
   omero.db.poolsize: 25
@@ -110,8 +109,6 @@ omero_server_config_set:
   # Disable all components except Blitz and Tables
   omero.server.nodedescriptors: "master:Blitz-0,Tables-0"
 
-omero_server_selfsigned_certificates: True
-
 ######################################################################
 # Other dependent role vars
 
@@ -163,6 +160,8 @@ idr_omero_web_public_url_filters:
 
 omero_web_release: "{{ idr_omero_web_release }}"
 
+omero_web_setup_redis_session: true
+
 omero_web_config_set:
   # web
   omero.web.api.max_limit: 1000
@@ -237,10 +236,10 @@ omero_web_config_set:
 # Plugins and additional web configuration
 
 omero_web_apps_packages:
-- omero-mapr==0.5.1
-- omero-iviewer==0.11.3
+- omero-mapr==0.5.2
+- omero-iviewer==0.13.0
 - idr-gallery==3.11.0
-- omero-figure==4.4.3
+- omero-figure==6.2.0
 omero_web_apps_names:
 - omero_mapr
 - omero_iviewer

diff --git a/ansible/group_vars/searchengine-hosts.yml b/ansible/group_vars/searchengine-hosts.yml
@@ -6,7 +6,7 @@ database_username: omeroreadonly
 database_user_password: "{{ idr_secret_postgresql_password_ro | default('omero') }}"
 searchenginecache_folder: /data/searchengine/searchengine/cacheddata/
 search_engineelasticsearch_docker_image: docker.elastic.co/elasticsearch/elasticsearch:8.8.1
-searchengine_docker_image: openmicroscopy/omero-searchengine:0.5.3
+searchengine_docker_image: openmicroscopy/omero-searchengine:0.5.4
 #ansible_python_interpreter: path/to/bin/python
 searchengine_index: searchengine_index
 cache_rows: 100000

diff --git a/ansible/idr-02-services.yml b/ansible/idr-02-services.yml
@@ -2,7 +2,6 @@
 
 ### Ingress services
 - import_playbook: idr-ftp.yml
-- import_playbook: idr-s3gateway.yml
 
 ### Export services
 - import_playbook: idr-export.yml

diff --git a/ansible/idr-docker.yml b/ansible/idr-docker.yml
@@ -8,8 +8,8 @@
       docker_use_ipv4_nic_mtu: True
       docker_version: 24.0.7
   tasks:
-  - name: install docker-python
+  - name: install python3-docker
     become: yes
     yum:
-      name: docker-python
+      name: python3-docker
       state: present
diff --git a/ansible/idr-omero.yml b/ansible/idr-omero.yml
@@ -48,7 +48,6 @@
   roles:
   - role: ome.basedeps
   - role: ome.versioncontrol_utils
-  - role: ome.python_pydata
   - role: ome.analysis_tools
 
 - hosts: "{{ idr_environment | default('idr') }}-omeroreadwrite-hosts"

diff --git a/ansible/idr-proxy-about.yml b/ansible/idr-proxy-about.yml
@@ -3,12 +3,6 @@
 - hosts: "{{ idr_environment | default('idr') }}-proxy-hosts"
 
   tasks:
-  - name: Install Python 3
-    become: true
-    yum:
-      name: python36
-      state: present
-
   - name: Create static directory
     become: yes
     file:

diff --git a/ansible/idr-s3gateway.yml b/ansible/idr-s3gateway.yml
diff --git a/ansible/molecule/ftp/molecule.yml b/ansible/molecule/ftp/molecule.yml
@@ -14,9 +14,12 @@ lint: |
 
 platforms:
   - name: idr-ftp
-    image: centos/systemd:latest
+    image: eniocarboni/docker-rockylinux-systemd:9
     command: /sbin/init
-    privileged: True
+    privileged: true
+    cgroupns_mode: host
+    tmpfs:
+      - /sys/fs/cgroup
     groups:
     - idr-ftp-hosts
     - ftp-hosts

diff --git a/ansible/molecule/ftp/tests/test_default.py b/ansible/molecule/ftp/tests/test_default.py
@@ -12,7 +12,7 @@
     32222,
 ])
 def test_listening(host, port):
-    assert host.socket('tcp://%d' % port).is_listening
+    assert host.socket('tcp://0.0.0.0:%d' % port).is_listening
 
 
 def test_upload(host):

diff --git a/ansible/molecule/publicidr/molecule.yml b/ansible/molecule/publicidr/molecule.yml
@@ -14,24 +14,30 @@ lint: |
 
 platforms:
   - name: idr-database-docker
-    image: centos/systemd:latest
+    image: eniocarboni/docker-rockylinux-systemd:9
     command: /sbin/init
-    privileged: True
+    privileged: true
+    cgroupns_mode: host
+    tmpfs:
+      - /sys/fs/cgroup
     groups:
-    - idr-database-hosts
-    - database-hosts
-    - idr-hosts
+      - idr-database-hosts
+      - database-hosts
+      - idr-hosts
 
   - name: idr-omeroreadwrite-docker
-    image: centos/systemd:latest
+    image: eniocarboni/docker-rockylinux-systemd:9
     command: /sbin/init
-    privileged: True
+    privileged: true
+    cgroupns_mode: host
+    tmpfs:
+      - /sys/fs/cgroup
     groups:
-    - idr-omero-hosts
-    - omero-hosts
-    - idr-omeroreadwrite-hosts
-    - omeroreadwrite-hosts
-    - idr-hosts
+      - idr-omero-hosts
+      - omero-hosts
+      - idr-omeroreadwrite-hosts
+      - omeroreadwrite-hosts
+      - idr-hosts
 
     ######################################################################
     # WARNING:
@@ -43,24 +49,30 @@ platforms:
     # TODO: Test idr-omero-readonly.yml
     ######################################################################
   - name: idr-omeroreadonly-docker
-    image: centos/systemd:latest
+    image: eniocarboni/docker-rockylinux-systemd:9
     command: /sbin/init
-    privileged: True
+    privileged: true
+    cgroupns_mode: host
+    tmpfs:
+      - /sys/fs/cgroup
     groups:
-    - idr-omero-hosts
-    - omero-hosts
-    - idr-omeroreadonly-hosts
-    - omeroreadonly-hosts
-    - idr-hosts
+      - idr-omero-hosts
+      - omero-hosts
+      - idr-omeroreadonly-hosts
+      - omeroreadonly-hosts
+      - idr-hosts
 
   - name: idr-proxy-docker
-    image: centos/systemd:latest
+    image: eniocarboni/docker-rockylinux-systemd:9
     command: /sbin/init
-    privileged: True
+    privileged: true
+    cgroupns_mode: host
+    tmpfs:
+      - /sys/fs/cgroup
     groups:
-    - idr-proxy-hosts
-    - proxy-hosts
-    - idr-hosts
+      - idr-proxy-hosts
+      - proxy-hosts
+      - idr-hosts
 
 provisioner:
   name: ansible