UCL-MIRSG · p-j-smith · Feb 4, 2025 · Jan 29, 2025 · Jan 29, 2025 · Feb 3, 2025
diff --git a/.github/workflows/molecule-docker.yaml b/.github/workflows/molecule-docker.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   molecule-docker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:

diff --git a/.github/workflows/molecule-firewalld.yaml b/.github/workflows/molecule-firewalld.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   molecule-firewalld:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:

diff --git a/.github/workflows/molecule-install-omero.yaml b/.github/workflows/molecule-install-omero.yaml
@@ -20,7 +20,7 @@ concurrency:
 
 jobs:
   molecule-install-omero:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       MOLECULE_RUN_TAGS: all
       PY_COLORS: 1

diff --git a/.github/workflows/molecule-install-xnat.yaml b/.github/workflows/molecule-install-xnat.yaml
@@ -20,7 +20,7 @@ concurrency:
 
 jobs:
   molecule-install-xnat:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:

diff --git a/.github/workflows/molecule-java.yaml b/.github/workflows/molecule-java.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   molecule-java:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:

diff --git a/.github/workflows/molecule-monitoring.yaml b/.github/workflows/molecule-monitoring.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   molecule-monitoring:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:

diff --git a/.github/workflows/molecule-nginx.yaml b/.github/workflows/molecule-nginx.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   molecule-nginx:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:

diff --git a/.github/workflows/molecule-postgresql.yaml b/.github/workflows/molecule-postgresql.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   molecule-postgresql:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:

diff --git a/.github/workflows/molecule-postgresql_upgrade.yaml b/.github/workflows/molecule-postgresql_upgrade.yaml
@@ -16,7 +16,7 @@ concurrency:
 
 jobs:
   molecule-postgresql-upgrade:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:

diff --git a/.github/workflows/molecule-provision.yaml b/.github/workflows/molecule-provision.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   molecule-provision:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:

diff --git a/.github/workflows/molecule-provision_accounts.yaml b/.github/workflows/molecule-provision_accounts.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   molecule-provision-accounts:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:

diff --git a/.github/workflows/molecule-python.yaml b/.github/workflows/molecule-python.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   molecule-python:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:

diff --git a/.github/workflows/molecule-tomcat.yaml b/.github/workflows/molecule-tomcat.yaml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   molecule-tomcat:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:

diff --git a/.renovaterc.json5 b/.renovaterc.json5
@@ -13,15 +13,15 @@
         "xnatdev/xnat-web",
         "xnatdev/xsync",
         "xnatx/ldap-auth-plugin",
-        "xnatdev/container-service",
-        "xnatx/xnatx-batch-launch-plugin",
-        "VUIIS/dax",
         "icrimaginginformatics/ohif-viewer-xnat-plugin",
         "xnatx/ml-plugin",
         "xnatx/datasets-plugin",
         "xnatdev/xnat-image-viewer-plugin",
         "xnatx/xnatx-dxm-settings-plugin",
         "NrgXnat/xnat-pipeline-engine",
+        "xnatdev/container-service",
+        "xnatx/xnatx-batch-launch-plugin",
+        "VUIIS/dax",
       ],
       groupName: "xnat",
       versioning: "loose",
@@ -46,7 +46,7 @@
     "VUIIS-dax": {
       defaultRegistryUrlTemplate: "https://api.github.com/repos/VUIIS/dax/contents/misc/xnat-plugins",
       transformTemplates: [
-        '{"releases": $.{"version": $join(["v", $match(name, /(\\d+\\.)?(\\d+\\.)?(\\*|\\d+)/ ).match ])}}',
+        '{"releases": $.{"version": $match(name, /(\\d+\\.)?(\\d+\\.)?(\\*|\\d+)/ ).match }}',
       ],
     },
   },
@@ -83,30 +83,6 @@
       depNameTemplate: "xnatx/ldap-auth-plugin",
       datasourceTemplate: "bitbucket-tags",
     },
-    {
-      customType: "regex",
-      description: "Update XNAT Container Service plugin version specified in roles/xnat/defaults/main.yml",
-      fileMatch: ["roles/xnat/defaults/main.yml$"],
-      matchStrings: ["container-service-(?<currentValue>.*?)-fat.jar"],
-      depNameTemplate: "xnatdev/container-service",
-      datasourceTemplate: "bitbucket-tags",
-    },
-    {
-      customType: "regex",
-      description: "Update XNAT batch launch plugin version specified in roles/xnat/defaults/main.yml",
-      fileMatch: ["roles/xnat/defaults/main.yml$"],
-      matchStrings: ["batch-launch-(?<currentValue>.*?).jar"],
-      depNameTemplate: "xnatx/xnatx-batch-launch-plugin",
-      datasourceTemplate: "bitbucket-tags",
-    },
-    {
-      customType: "regex",
-      description: "Update XNAT dax plugin specified in roles/xnat/defaults/main.yml",
-      fileMatch: ["roles/xnat/defaults/main.yml$"],
-      matchStrings: ["dax-plugin-genProcData-(?<currentValue>.*?).jar"],
-      depNameTemplate: "VUIIS/dax",
-      datasourceTemplate: "custom.VUIIS-dax",
-    },
     {
       customType: "regex",
       description: "Update OHIF Viewer plugin version specified in roles/xnat/defaults/main.yml",
@@ -155,5 +131,35 @@
       depNameTemplate: "NrgXnat/xnat-pipeline-engine",
       datasourceTemplate: "github-releases",
     },
+    {
+      customType: "regex",
+      description: "Update XNAT Container Service plugin version used for testing with molecule",
+      fileMatch: [
+        "playbooks/molecule/resources/xnat/inventory/group_vars/all/server.yml$",
+      ],
+      matchStrings: ["container-service-(?<currentValue>.*?)-fat.jar"],
+      depNameTemplate: "xnatdev/container-service",
+      datasourceTemplate: "bitbucket-tags",
+    },
+    {
+      customType: "regex",
+      description: "Update XNAT batch launch plugin version used for testing with molecule",
+      fileMatch: [
+        "playbooks/molecule/resources/xnat/inventory/group_vars/all/server.yml$",
+      ],
+      matchStrings: ["batch-launch-(?<currentValue>.*?).jar"],
+      depNameTemplate: "xnatx/xnatx-batch-launch-plugin",
+      datasourceTemplate: "bitbucket-tags",
+    },
+    {
+      customType: "regex",
+      description: "Update XNAT dax plugin used for testing with molecule",
+      fileMatch: [
+        "playbooks/molecule/resources/xnat/inventory/group_vars/all/server.yml$",
+      ],
+      matchStrings: ["dax-plugin-genProcData-(?<currentValue>.*?).jar"],
+      depNameTemplate: "VUIIS/dax",
+      datasourceTemplate: "custom.VUIIS-dax",
+    },
   ],
 }
diff --git a/molecule_configs/centos7_base_config.yml b/molecule_configs/centos7_base_config.yml
@@ -52,6 +52,8 @@ provisioner:
     verify: ../resources/verify.yml
   env:
     ANSIBLE_VERBOSITY: "1"
+    ANSIBLE_ROLES_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../roles/:~/.ansible/roles
+    ANSIBLE_COLLECTIONS_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../../../../:~/.ansible/collections
 
 verifier:
   name: ansible

diff --git a/molecule_configs/rocky9_base_config.yml b/molecule_configs/rocky9_base_config.yml
@@ -53,6 +53,8 @@ provisioner:
     verify: ../resources/verify.yml
   env:
     ANSIBLE_VERBOSITY: "1"
+    ANSIBLE_ROLES_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../roles/:~/.ansible/roles
+    ANSIBLE_COLLECTIONS_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../../../../:~/.ansible/collections
 
 verifier:
   name: ansible

diff --git a/playbooks/molecule/centos7_monitoring/molecule.yml b/playbooks/molecule/centos7_monitoring/molecule.yml
@@ -82,6 +82,8 @@ provisioner:
     verify: ../resources/monitoring/verify.yml
   env:
     ANSIBLE_VERBOSITY: "1"
+    ANSIBLE_ROLES_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../roles/:~/.ansible/roles
+    ANSIBLE_COLLECTIONS_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../../../:~/.ansible/collections
 
 verifier:
   name: ansible

diff --git a/playbooks/molecule/centos7_xnat/molecule.yml b/playbooks/molecule/centos7_xnat/molecule.yml
@@ -116,6 +116,8 @@ provisioner:
     verify: ../resources/xnat/verify.yml
   env:
     ANSIBLE_VERBOSITY: 1
+    ANSIBLE_ROLES_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../roles/:~/.ansible/roles
+    ANSIBLE_COLLECTIONS_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../../../:~/.ansible/collections
 
 lint: |
   set -e

diff --git a/playbooks/molecule/resources/xnat/inventory/group_vars/all/server.yml b/playbooks/molecule/resources/xnat/inventory/group_vars/all/server.yml
@@ -36,3 +36,8 @@ xnat_config:
   site_name: MIRSG_XNAT
   site_description: <h1>MIRSG XNAT</h1><p>A test instance of XNAT.
   admin_password: "{{ vault_admin_password }}"
+
+xnat_server_specific_plugin_urls:
+  - https://api.bitbucket.org/2.0/repositories/xnatdev/container-service/downloads/container-service-3.6.2-fat.jar
+  - https://api.bitbucket.org/2.0/repositories/xnatx/xnatx-batch-launch-plugin/downloads/batch-launch-0.7.0.jar
+  - https://github.com/VUIIS/dax/raw/main/misc/xnat-plugins/dax-plugin-genProcData-1.4.2.jar
diff --git a/playbooks/molecule/rocky8_omero/molecule.yml b/playbooks/molecule/rocky8_omero/molecule.yml
@@ -89,6 +89,8 @@ provisioner:
     verify: ../resources/omero/verify.yml
   env:
     ANSIBLE_VERBOSITY: "1"
+    ANSIBLE_ROLES_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../roles/:~/.ansible/roles
+    ANSIBLE_COLLECTIONS_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../../../:~/.ansible/collections
 
 verifier:
   name: ansible

diff --git a/playbooks/molecule/rocky9_monitoring/molecule.yml b/playbooks/molecule/rocky9_monitoring/molecule.yml
@@ -84,6 +84,8 @@ provisioner:
     verify: ../resources/monitoring/verify.yml
   env:
     ANSIBLE_VERBOSITY: "1"
+    ANSIBLE_ROLES_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../roles/:~/.ansible/roles
+    ANSIBLE_COLLECTIONS_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../../../:~/.ansible/collections
 
 verifier:
   name: ansible

diff --git a/playbooks/molecule/rocky9_xnat/molecule.yml b/playbooks/molecule/rocky9_xnat/molecule.yml
@@ -119,6 +119,8 @@ provisioner:
     verify: ../resources/xnat/verify.yml
   env:
     ANSIBLE_VERBOSITY: "1"
+    ANSIBLE_ROLES_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../roles/:~/.ansible/roles
+    ANSIBLE_COLLECTIONS_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../../../:~/.ansible/collections
 
 verifier:
   name: ansible

diff --git a/roles/xnat/defaults/main.yml b/roles/xnat/defaults/main.yml
@@ -43,7 +43,6 @@ xnat_plugin_urls:
   - https://api.bitbucket.org/2.0/repositories/xnatx/ldap-auth-plugin/downloads/ldap-auth-plugin-1.1.0.jar
   - https://api.bitbucket.org/2.0/repositories/xnatdev/container-service/downloads/container-service-3.6.2-fat.jar
   - https://api.bitbucket.org/2.0/repositories/xnatx/xnatx-batch-launch-plugin/downloads/batch-launch-0.7.0.jar
-  - https://github.com/VUIIS/dax/raw/main/misc/xnat-plugins/dax-plugin-genProcData-1.4.2.jar
   - https://api.bitbucket.org/2.0/repositories/icrimaginginformatics/ohif-viewer-xnat-plugin/downloads/ohif-viewer-3.7.0-XNAT-1.8.10.jar
   - https://api.bitbucket.org/2.0/repositories/xnatx/ml-schema-plugin/downloads/ml-schema-plugin-1.0.0.jar
   - https://api.bitbucket.org/2.0/repositories/xnatx/datasets-schema-plugin/downloads/datasets-schema-plugin-1.0.0.jar