Merge branch 'main' into renovate/xnat

UCL-MIRSG · Jan 3, 2025 · 8f573d7 · 8f573d7
2 parents f5a5a6c + 478ec51
commit 8f573d7
Show file tree

Hide file tree

Showing 23 changed files with 64 additions and 47 deletions.
diff --git a/.github/workflows/links.yaml b/.github/workflows/links.yaml
@@ -14,6 +14,7 @@ jobs:
     timeout-minutes: 2
     steps:
       - name: Check links
-        uses: UCL-MIRSG/.github/actions/links@1287e3a2d7a0a513066b1b04d3d2814b44e96ac9 # v0
+        uses: UCL-MIRSG/.github/actions/links@a7534b4183ae58f24714fe8633c4433365131257 # v0
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          app-id: ${{ vars.LINKS_APP_ID }}
+          app-pem: ${{ secrets.LINKS_PRIVATE_KEY }}
diff --git a/.github/workflows/linting.yaml b/.github/workflows/linting.yaml
@@ -12,7 +12,7 @@ jobs:
   linting:
     runs-on: ubuntu-latest
     steps:
-      - uses: UCL-MIRSG/.github/actions/linting@1287e3a2d7a0a513066b1b04d3d2814b44e96ac9 # v0
+      - uses: UCL-MIRSG/.github/actions/linting@058474bb0eeb6f67f8f33672d9dcbdfcb44b6584 # v0
         with:
           ansible-roles-config: ./meta/requirements.yml
           pre-commit-config: ./.pre-commit-config.yaml
diff --git a/.github/workflows/manage-projects.yaml b/.github/workflows/manage-projects.yaml
@@ -10,7 +10,7 @@ jobs:
   add-issue-to-project:
     runs-on: ubuntu-latest
     steps:
-      - uses: UCL-MIRSG/.github/actions/add-to-project@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/add-to-project@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           app-id: ${{ secrets.APP_ID }}
           app-pem: ${{ secrets.APP_PEM }}
diff --git a/.github/workflows/molecule-docker.yaml b/.github/workflows/molecule-docker.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-docker.yml
+      - .github/workflows/molecule-docker.yaml
       - "!**/README.md"
 
 concurrency:
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}

diff --git a/.github/workflows/molecule-firewalld.yaml b/.github/workflows/molecule-firewalld.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-firewalld.yml
+      - .github/workflows/molecule-firewalld.yaml
       - "!**/README.md"
 
 concurrency:
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}

diff --git a/.github/workflows/molecule-install-omero.yaml b/.github/workflows/molecule-install-omero.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-install-omero.yml
+      - .github/workflows/molecule-install-omero.yaml
       - "!**/README.md"
   release:
     types:
@@ -27,7 +27,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: 8
           scenario: rocky8_omero

diff --git a/.github/workflows/molecule-install-xnat.yaml b/.github/workflows/molecule-install-xnat.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-install-xnat.yml
+      - .github/workflows/molecule-install-xnat.yaml
       - "!**/README.md"
   release:
     types:
@@ -33,7 +33,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}

diff --git a/.github/workflows/molecule-java.yaml b/.github/workflows/molecule-java.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-java.yml
+      - .github/workflows/molecule-java.yaml
       - "!**/README.md"
 
 concurrency:
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}

diff --git a/.github/workflows/molecule-monitoring.yaml b/.github/workflows/molecule-monitoring.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-monitoring.yml
+      - .github/workflows/molecule-monitoring.yaml
       - "!**/README.md"
 
 concurrency:
@@ -31,7 +31,7 @@ jobs:
       ANSIBLE_ROLES_PATH: ansible_collections/mirsg/infrastructure/roles
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}

diff --git a/.github/workflows/molecule-nginx.yaml b/.github/workflows/molecule-nginx.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-nginx.yml
+      - .github/workflows/molecule-nginx.yaml
       - "!**/README.md"
 
 concurrency:
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}

diff --git a/.github/workflows/molecule-postgresql.yaml b/.github/workflows/molecule-postgresql.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-postgresql.yml
+      - .github/workflows/molecule-postgresql.yaml
       - "!**/README.md"
 
 concurrency:
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}

diff --git a/.github/workflows/molecule-postgresql_upgrade.yaml b/.github/workflows/molecule-postgresql_upgrade.yaml
@@ -6,7 +6,7 @@ on:
     paths:
       - molecule_configs/*
       - roles/postgresql_upgrade/**
-      - .github/workflows/molecule-postgresql_upgrade.yml
+      - .github/workflows/molecule-postgresql_upgrade.yaml
       - "!**/README.md"
 
 concurrency:
@@ -29,7 +29,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}

diff --git a/.github/workflows/molecule-provision.yaml b/.github/workflows/molecule-provision.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-provision.yml
+      - .github/workflows/molecule-provision.yaml
       - "!**/README.md"
 
 concurrency:
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}

diff --git a/.github/workflows/molecule-provision_accounts.yaml b/.github/workflows/molecule-provision_accounts.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - roles/provision_accounts/**
       - playbooks/setup_user_accounts.yml
-      - .github/workflows/molecule-provision_accounts.yml
+      - .github/workflows/molecule-provision_accounts.yaml
       - "!**/README.md"
 
 concurrency:
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}

diff --git a/.github/workflows/molecule-python.yaml b/.github/workflows/molecule-python.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-python.yml
+      - .github/workflows/molecule-python.yaml
       - "!**/README.md"
 
 concurrency:
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}

diff --git a/.github/workflows/molecule-tomcat.yaml b/.github/workflows/molecule-tomcat.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-tomcat.yml
+      - .github/workflows/molecule-tomcat.yaml
       - "!**/README.md"
 
 concurrency:
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 ---
 repos:
   - repo: https://github.com/UCL-MIRSG/.github
-    rev: v0.127.0
+    rev: v0.182.0
     hooks:
       - id: mirsg-hooks
diff --git a/.renovaterc.json5 b/.renovaterc.json5
@@ -26,6 +26,23 @@
       groupName: "xnat",
       versioning: "loose",
     },
+    {
+      description: "RedHat8 support ome.ice",
+      matchPackageNames: ["ome.ice"],
+      allowedVersions: "<=4.3.0",
+    },
+    ,
+    {
+      description: "RedHat8 support ome.omero_user",
+      matchPackageNames: ["ome.omero_user"],
+      allowedVersions: "<=0.3.1",
+    },
+    ,
+    {
+      description: "RedHat8 support ome.selinux_utils",
+      matchPackageNames: ["ome.selinux_utils"],
+      allowedVersions: "<=2.0.2",
+    },
   ],
   customDatasources: {
     "VUIIS-dax": {

diff --git a/README.md b/README.md
@@ -46,15 +46,14 @@ example, for upgrading the postgresql version on the `ucl_test` server:
 ansible-playbook mirsg.infrastructure.upgrade_postgresql -u <user> --ask-become-pass -l ucl_test -i environments/cs-production/xnat/hosts.yml --vault-password-file ~/.ucl_xnat-vault_password
 ```
 
-The
-[upgrade_postgresql.yml](https://github.com/UCL-MIRSG/ansible-collection-infra/blob/f2574a6d6d7e5682e8507373643722916c5461bc/playbooks/upgrade_postgresql.yml)
-playbook prompts for the version to upgrade from and to upgrade to.
+The [upgrade_postgresql.yml](./playbooks/upgrade_postgresql.yml) playbook
+prompts for the version to upgrade from and to upgrade to.
 
 The following variable needs to be set:
 `postgresql_upgrade_data_dir: “/var/lib/pgsql/{{ postgreql_upgrade_new_version }}/data”`
 
 This is done in the group vars for the server you're updating i.e.
-[ucl_test](https://github.com/UCL-MIRSG/UCLMedicalImagingEnv/blob/ef69a7116dcacbc30a146a5d06c928d686805dd5/environments/cs-production/xnat/group_vars/ucl_test/vars)
+[ucl_test](https://github.com/UCL-MIRSG/UCLMedicalImagingEnv/blob/main/environments/cs-production/xnat/group_vars/ucl_test/vars)
 
 ## Testing this collection
 
@@ -206,7 +205,7 @@ molecule --base-config ../molecule_configs/centos7_base_config.yml test --scenar
 
 When a PR that modifies a role or playbook is opened, the changes are
 [tested](.github/workflows/) by deploying that role using GitHub Actions. See
-the [`molecule-firewalld` workflow](.github/workflows/molecule-firewalld.yml)
+the [`molecule-firewalld` workflow](.github/workflows/molecule-firewalld.yaml)
 for an example.
 
 ## Code style and formatting

diff --git a/playbooks/README.md b/playbooks/README.md
@@ -67,7 +67,7 @@ paths to these playbooks.
 ### Add a GitHub Workflow
 
 You should add a GitHub workflow for your new playbook to
-`.github/workflows/molecule-my-playbook.yml`. The workflow should follow this
+`.github/workflows/molecule-my-playbook.yaml`. The workflow should follow this
 format:
 
 ```yaml
@@ -76,17 +76,17 @@ on:
   pull_request:
     paths:
       - "playbooks/my_playbook.yml"
-      - ".github/workflows/molecule-role-used-in-playbook.yml"
+      - ".github/workflows/molecule-role-used-in-playbook.yaml"
 
 jobs:
   molecule-my_playbook:
-    uses: ./.github/workflows/molecule.yml
+    uses: UCL-MIRSG/.github/actions/molecule-test@v0
     with:
       tests-path: ansible_collections/mirsg/infrastructure/playbooks
 ```
 
 This uses the
-[`.github/workflows/molecule.yml` reusable workflow](.github/workflows/molecule.yml)
+[`UCL-MIRSG/.github/actions/molecule-test` composite action](https://github.com/UCL-MIRSG/.github/blob/main/actions/molecule-test/action.yml)
 to run molecule on the relevant role.
 
 ## Playbooks

diff --git a/playbooks/group_vars/xnat.yml b/playbooks/group_vars/xnat.yml
@@ -21,7 +21,7 @@ xnat_source:
   context_file_location: /usr/share/tomcat/webapps/ROOT/META-INF/context.xml
 
 # mirsg.infrastructure.tomcat
-tomcat_version: 9.0.97
+tomcat_version: 9.0.98
 tomcat_owner: tomcat
 tomcat_group: tomcat
 

diff --git a/roles/README.md b/roles/README.md
@@ -72,7 +72,7 @@ We have a GitHub workflow for running molecule on each role, and doing so only
 when that role changes.
 
 You should add a GitHub workflow for your new role to
-`.github/workflows/molecule-my-role.yml`. The workflow should follow this
+`.github/workflows/molecule-my-role.yaml`. The workflow should follow this
 format:
 
 ```yaml
@@ -81,16 +81,16 @@ on:
   pull_request:
     paths:
       - "roles/my_role/**"
-      - ".github/workflows/molecule.yml"
-      - ".github/workflows/molecule-my-role.yml"
+      - ".github/workflows/molecule.yaml"
+      - ".github/workflows/molecule-my-role.yaml"
 
 jobs:
   molecule-my_role:
-    uses: ./.github/workflows/molecule.yml
+    uses: UCL-MIRSG/.github/actions/molecule-test@v0
     with:
       tests-path: ansible_collections/mirsg/infrastructure/roles/my_role
 ```
 
 This uses the
-[`.github/workflows/molecule.yml` reusable workflow](.github/workflows/molecule.yml)
+[`UCL-MIRSG/.github/actions/molecule-test` composite action](https://github.com/UCL-MIRSG/.github/blob/main/actions/molecule-test/action.yml)
 to run molecule on the relevant role.
diff --git a/roles/monitoring_server/tasks/install_nginx_container.yml b/roles/monitoring_server/tasks/install_nginx_container.yml
@@ -72,7 +72,7 @@
   community.docker.docker_container:
     name: nginx
     hostname: nginx
-    image: nginx@sha256:fb197595ebe76b9c0c14ab68159fd3c08bd067ec62300583543f0ebda353b5be
+    image: nginx@sha256:42e917aaa1b5bb40dd0f6f7f4f857490ac7747d7ef73b391c774a41a8b994f15
     state: started
     networks:
       - name: monitor-net