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

Reduce the prod-playbooks #379

Merged
merged 10 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
11 changes: 5 additions & 6 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/checkout@v4
- uses: actions/setup-python@v4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actions/setup-python bump to v5

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in fee1fde

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 }}"
21 changes: 16 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
OME production services playbooks
=================================

**NOTE: We are in the process of migration of the playbooks in this repo to Rocky Linux 9/RHEL 9 OS but at the moment, they function only on CentOS 7 !!**
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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the intent of this repository to only hold OMERO production playbooks moving forward?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the intent of this repository to only hold OMERO production playbooks moving forward?

That was my initial intent when planning this PR and discussing the tactics previously with @jburel .
What else would you like to hold here @sbesson ?
The idea is to minimize and simplify wherever possible.
But happy to discuss about better strategies.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have anything different to propose. I was mostly enquiring as I saw the omero subfolder was maintained and this was historically used for separating the OMERO playbooks from the others.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, omero folder is maintained to get out of the conandrum of molecule not finding the roles folder. Maybe I could rename the folder to playbooks ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in efd4d1f


If you are looking for examples of running your own production OMERO.server see

https://github.com/ome/omero-deployment-examples
Expand All @@ -11,13 +15,20 @@ If you are looking for examples of running your own production OMERO.server see
Details
-------

- Install `Ansible` >2.10.
- 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 omero
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).
24 changes: 0 additions & 24 deletions Vagrantfile

This file was deleted.

2 changes: 1 addition & 1 deletion ansible.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

[defaults]
# Galaxy roles
roles_path = ./vendor
roles_path = ./omero/roles

# These tend to be annoying.
retry_files_enabled = False
36 changes: 0 additions & 36 deletions bootstrap/playbook.yml

This file was deleted.

17 changes: 0 additions & 17 deletions k8s/README.md

This file was deleted.

5 changes: 0 additions & 5 deletions k8s/bootstrap/playbook.yml

This file was deleted.

6 changes: 0 additions & 6 deletions k8s/prerequisites/playbook.yml

This file was deleted.

28 changes: 0 additions & 28 deletions molecule/bootstrap/molecule.yml

This file was deleted.

22 changes: 0 additions & 22 deletions molecule/docker-prod/Dockerfile.j2

This file was deleted.

19 changes: 0 additions & 19 deletions molecule/docker-prod/converge.yml

This file was deleted.

56 changes: 0 additions & 56 deletions molecule/docker-prod/molecule.yml

This file was deleted.

22 changes: 0 additions & 22 deletions molecule/docker-prod/prepare.yml

This file was deleted.

39 changes: 0 additions & 39 deletions molecule/docker-prod/tests/test_default.py

This file was deleted.

Loading
Loading