From dd26eb590b2b9c4d4d3d56eb6a07b2c2b2d35416 Mon Sep 17 00:00:00 2001 From: pwalczysko Date: Wed, 13 Nov 2024 16:18:10 +0000 Subject: [PATCH] Upgrade actions and ubuntu version --- .github/workflows/molecule.yml | 10 +++++----- omero/requirements.yml | 10 +++------- requirements.yml | 10 +++------- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index a422025a..2e604ae5 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -8,11 +8,11 @@ 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 @@ -20,17 +20,17 @@ 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 matrix: scenario: ${{fromJson(needs.list-scenarios.outputs.matrix)}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.9' - name: Install Ansible & Molecule run: | pip install "ansible<8" "ansible-lint<6.13" flake8 diff --git a/omero/requirements.yml b/omero/requirements.yml index 87f05f80..6b21bd5e 100644 --- a/omero/requirements.yml +++ b/omero/requirements.yml @@ -14,13 +14,9 @@ - role: ome.selinux_utils - role: ome.versioncontrol_utils - role: ome.ssl_certificate -- name: nfs_mount - src: https://github.com/ome/ansible-role-nfs-mount/ -- name: nfs_share - src: https://github.com/ome/ansible-role-nfs-share/ -- name: iptables_raw - src: https://github.com/pwalczysko/ansible-role-iptables-raw/ - version: rocky9 +- role: nfs_mount +- role: nfs_share +- role: iptables_raw - role: ome.cli_utils - role: ome.docker - role: ome.postgresql_backup diff --git a/requirements.yml b/requirements.yml index 87f05f80..6b21bd5e 100644 --- a/requirements.yml +++ b/requirements.yml @@ -14,13 +14,9 @@ - role: ome.selinux_utils - role: ome.versioncontrol_utils - role: ome.ssl_certificate -- name: nfs_mount - src: https://github.com/ome/ansible-role-nfs-mount/ -- name: nfs_share - src: https://github.com/ome/ansible-role-nfs-share/ -- name: iptables_raw - src: https://github.com/pwalczysko/ansible-role-iptables-raw/ - version: rocky9 +- role: nfs_mount +- role: nfs_share +- role: iptables_raw - role: ome.cli_utils - role: ome.docker - role: ome.postgresql_backup