[pull] master from ome:master

.github/workflows/molecule.yml

@@ -8,34 +8,33 @@ on:
 jobs:
 
   list-scenarios:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       matrix: ${{ steps.listscenarios.outputs.scenarios }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - id: listscenarios
         uses: ome/action-ansible-molecule-list-scenarios@main
 
   test:
     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
       matrix:
         scenario: ${{fromJson(needs.list-scenarios.outputs.matrix)}}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: '3.8'
+          python-version: '3.9'
       - name: Install Ansible & Molecule
         run: |
             pip install "ansible<8" "ansible-lint<6.13" flake8
             pip install "molecule<5" "ansible-compat<4"
             pip install molecule-plugins[docker] pytest-testinfra
-            pip3.8 install jmespath
       - name: Run molecule
         run: molecule test -s "${{ matrix.scenario }}"

README.md

@@ -2,6 +2,11 @@ OME production services playbooks
 =================================
 
 These playbooks encapsulate the running of various production servers run by the OME team.
+
+At the moment, only the `ome-demoserver.yml` playbook is available here. This is a playbook for OMERO.demo server on https://demo.openmicroscopy.org OMERO.server and OMERO.web. You can read more about this [OMERO.demo server on our website](https://www.openmicroscopy.org/explore/).
+
+We are in the process of adding more OME team's production playbooks here.
+
 If you are looking for examples of running your own production OMERO.server see
 
   https://github.com/ome/omero-deployment-examples
@@ -10,13 +15,20 @@ If you are looking for examples of running your own production OMERO.server see
 Details
 -------
 
-- Install `Ansible` and dependencies using the [ome-ansible-molecule package](https://pypi.org/project/ome-ansible-molecule/).
+- Install `Ansible` >2.10
 - Install required roles: `ansible-galaxy install -r requirements.yml`
-- Run the [`site.yml` playbook](site.yml).
+- Run the `ome-demoserver.yml` playbook:
+
+```
+cd playbooks
+ansible-playbook --ask-become --become -i $PATH/TO/INVENTORY ome-demoserver.yml -l $YOUR-HOST-ADDRESS-OR-IP --diff
+```
+
 
-For details of individual playbooks see the comments in [`site.yml`](site.yml).
 
 Testing
 -------
 
-All server playbooks have a corresponding [molecule](https://molecule.readthedocs.io/) test scenario under [`molecule`](molecule).
+We test the playbooks here on Rocky Linux 9 platform via [Ansible Molecule](https://molecule.readthedocs.io/), see test scenarios under [`molecule`](molecule).
+
+The main components of the playbooks (roles) are being independently tested on both Rocky Linux 9 and Ubuntu 22.04. See e.g. [ome.omero_server role](https://github.com/ome/ansible-role-omero-server/tree/master/molecule).

ansible.cfg

@@ -10,7 +10,7 @@
 
 [defaults]
 # Galaxy roles
-roles_path = ./vendor
+roles_path = ./playbooks/roles
 
 # These tend to be annoying.
 retry_files_enabled = False