Skip to content

Commit d5ab1fc

Browse files
p-j-smithp-j-smith
authored
Remove DAX plugin (#163)
Fixes #95 - remove DAX, Container Service, and Batch Launch plugins from list of default XNAT plugin - add these plugins as server-specific plugins in molecule tests
1 parent 866191a commit d5ab1fc

23 files changed

+66
-44
lines changed

‎.github/workflows/molecule-docker.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
1818
jobs:
1919
molecule-docker:
20-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-22.04
2121
strategy:
2222
fail-fast: true
2323
matrix:

‎.github/workflows/molecule-firewalld.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
1818
jobs:
1919
molecule-firewalld:
20-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-22.04
2121
strategy:
2222
fail-fast: true
2323
matrix:

‎.github/workflows/molecule-install-omero.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ concurrency:
2020
2121
jobs:
2222
molecule-install-omero:
23-
runs-on: ubuntu-latest
23+
runs-on: ubuntu-22.04
2424
env:
2525
MOLECULE_RUN_TAGS: all
2626
PY_COLORS: 1

‎.github/workflows/molecule-install-xnat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ concurrency:
2020
2121
jobs:
2222
molecule-install-xnat:
23-
runs-on: ubuntu-latest
23+
runs-on: ubuntu-22.04
2424
strategy:
2525
fail-fast: true
2626
matrix:

‎.github/workflows/molecule-java.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
1818
jobs:
1919
molecule-java:
20-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-22.04
2121
strategy:
2222
fail-fast: true
2323
matrix:

‎.github/workflows/molecule-monitoring.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
1818
jobs:
1919
molecule-monitoring:
20-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-22.04
2121
strategy:
2222
fail-fast: true
2323
matrix:

‎.github/workflows/molecule-nginx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
1818
jobs:
1919
molecule-nginx:
20-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-22.04
2121
strategy:
2222
fail-fast: true
2323
matrix:

‎.github/workflows/molecule-postgresql.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
1818
jobs:
1919
molecule-postgresql:
20-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-22.04
2121
strategy:
2222
fail-fast: true
2323
matrix:

‎.github/workflows/molecule-postgresql_upgrade.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616
1717
jobs:
1818
molecule-postgresql-upgrade:
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-22.04
2020
strategy:
2121
fail-fast: true
2222
matrix:

‎.github/workflows/molecule-provision.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
1818
jobs:
1919
molecule-provision:
20-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-22.04
2121
strategy:
2222
fail-fast: true
2323
matrix:

‎.github/workflows/molecule-provision_accounts.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
1818
jobs:
1919
molecule-provision-accounts:
20-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-22.04
2121
strategy:
2222
fail-fast: true
2323
matrix:

‎.github/workflows/molecule-python.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
1818
jobs:
1919
molecule-python:
20-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-22.04
2121
strategy:
2222
fail-fast: true
2323
matrix:

‎.github/workflows/molecule-tomcat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
1818
jobs:
1919
molecule-tomcat:
20-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-22.04
2121
strategy:
2222
fail-fast: true
2323
matrix:

‎.renovaterc.json5

+34-28
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
"xnatdev/xnat-web",
1414
"xnatdev/xsync",
1515
"xnatx/ldap-auth-plugin",
16-
"xnatdev/container-service",
17-
"xnatx/xnatx-batch-launch-plugin",
18-
"VUIIS/dax",
1916
"icrimaginginformatics/ohif-viewer-xnat-plugin",
2017
"xnatx/ml-plugin",
2118
"xnatx/datasets-plugin",
2219
"xnatdev/xnat-image-viewer-plugin",
2320
"xnatx/xnatx-dxm-settings-plugin",
2421
"NrgXnat/xnat-pipeline-engine",
22+
"xnatdev/container-service",
23+
"xnatx/xnatx-batch-launch-plugin",
24+
"VUIIS/dax",
2525
],
2626
groupName: "xnat",
2727
versioning: "loose",
@@ -46,7 +46,7 @@
4646
"VUIIS-dax": {
4747
defaultRegistryUrlTemplate: "https://api.github.com/repos/VUIIS/dax/contents/misc/xnat-plugins",
4848
transformTemplates: [
49-
'{"releases": $.{"version": $join(["v", $match(name, /(\\d+\\.)?(\\d+\\.)?(\\*|\\d+)/ ).match ])}}',
49+
'{"releases": $.{"version": $match(name, /(\\d+\\.)?(\\d+\\.)?(\\*|\\d+)/ ).match }}',
5050
],
5151
},
5252
},
@@ -83,30 +83,6 @@
8383
depNameTemplate: "xnatx/ldap-auth-plugin",
8484
datasourceTemplate: "bitbucket-tags",
8585
},
86-
{
87-
customType: "regex",
88-
description: "Update XNAT Container Service plugin version specified in roles/xnat/defaults/main.yml",
89-
fileMatch: ["roles/xnat/defaults/main.yml$"],
90-
matchStrings: ["container-service-(?<currentValue>.*?)-fat.jar"],
91-
depNameTemplate: "xnatdev/container-service",
92-
datasourceTemplate: "bitbucket-tags",
93-
},
94-
{
95-
customType: "regex",
96-
description: "Update XNAT batch launch plugin version specified in roles/xnat/defaults/main.yml",
97-
fileMatch: ["roles/xnat/defaults/main.yml$"],
98-
matchStrings: ["batch-launch-(?<currentValue>.*?).jar"],
99-
depNameTemplate: "xnatx/xnatx-batch-launch-plugin",
100-
datasourceTemplate: "bitbucket-tags",
101-
},
102-
{
103-
customType: "regex",
104-
description: "Update XNAT dax plugin specified in roles/xnat/defaults/main.yml",
105-
fileMatch: ["roles/xnat/defaults/main.yml$"],
106-
matchStrings: ["dax-plugin-genProcData-(?<currentValue>.*?).jar"],
107-
depNameTemplate: "VUIIS/dax",
108-
datasourceTemplate: "custom.VUIIS-dax",
109-
},
11086
{
11187
customType: "regex",
11288
description: "Update OHIF Viewer plugin version specified in roles/xnat/defaults/main.yml",
@@ -155,5 +131,35 @@
155131
depNameTemplate: "NrgXnat/xnat-pipeline-engine",
156132
datasourceTemplate: "github-releases",
157133
},
134+
{
135+
customType: "regex",
136+
description: "Update XNAT Container Service plugin version used for testing with molecule",
137+
fileMatch: [
138+
"playbooks/molecule/resources/xnat/inventory/group_vars/all/server.yml$",
139+
],
140+
matchStrings: ["container-service-(?<currentValue>.*?)-fat.jar"],
141+
depNameTemplate: "xnatdev/container-service",
142+
datasourceTemplate: "bitbucket-tags",
143+
},
144+
{
145+
customType: "regex",
146+
description: "Update XNAT batch launch plugin version used for testing with molecule",
147+
fileMatch: [
148+
"playbooks/molecule/resources/xnat/inventory/group_vars/all/server.yml$",
149+
],
150+
matchStrings: ["batch-launch-(?<currentValue>.*?).jar"],
151+
depNameTemplate: "xnatx/xnatx-batch-launch-plugin",
152+
datasourceTemplate: "bitbucket-tags",
153+
},
154+
{
155+
customType: "regex",
156+
description: "Update XNAT dax plugin used for testing with molecule",
157+
fileMatch: [
158+
"playbooks/molecule/resources/xnat/inventory/group_vars/all/server.yml$",
159+
],
160+
matchStrings: ["dax-plugin-genProcData-(?<currentValue>.*?).jar"],
161+
depNameTemplate: "VUIIS/dax",
162+
datasourceTemplate: "custom.VUIIS-dax",
163+
},
158164
],
159165
}

‎molecule_configs/centos7_base_config.yml

+2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ provisioner:
5252
verify: ../resources/verify.yml
5353
env:
5454
ANSIBLE_VERBOSITY: "1"
55+
ANSIBLE_ROLES_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../roles/:~/.ansible/roles
56+
ANSIBLE_COLLECTIONS_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../../../../:~/.ansible/collections
5557

5658
verifier:
5759
name: ansible

‎molecule_configs/rocky9_base_config.yml

+2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ provisioner:
5353
verify: ../resources/verify.yml
5454
env:
5555
ANSIBLE_VERBOSITY: "1"
56+
ANSIBLE_ROLES_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../roles/:~/.ansible/roles
57+
ANSIBLE_COLLECTIONS_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../../../../:~/.ansible/collections
5658

5759
verifier:
5860
name: ansible

‎playbooks/molecule/centos7_monitoring/molecule.yml

+2
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ provisioner:
8282
verify: ../resources/monitoring/verify.yml
8383
env:
8484
ANSIBLE_VERBOSITY: "1"
85+
ANSIBLE_ROLES_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../roles/:~/.ansible/roles
86+
ANSIBLE_COLLECTIONS_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../../../:~/.ansible/collections
8587

8688
verifier:
8789
name: ansible

‎playbooks/molecule/centos7_xnat/molecule.yml

+2
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ provisioner:
116116
verify: ../resources/xnat/verify.yml
117117
env:
118118
ANSIBLE_VERBOSITY: 1
119+
ANSIBLE_ROLES_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../roles/:~/.ansible/roles
120+
ANSIBLE_COLLECTIONS_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../../../:~/.ansible/collections
119121

120122
lint: |
121123
set -e

‎playbooks/molecule/resources/xnat/inventory/group_vars/all/server.yml

+5
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,8 @@ xnat_config:
3636
site_name: MIRSG_XNAT
3737
site_description: <h1>MIRSG XNAT</h1><p>A test instance of XNAT.
3838
admin_password: "{{ vault_admin_password }}"
39+
40+
xnat_server_specific_plugin_urls:
41+
- https://api.bitbucket.org/2.0/repositories/xnatdev/container-service/downloads/container-service-3.6.2-fat.jar
42+
- https://api.bitbucket.org/2.0/repositories/xnatx/xnatx-batch-launch-plugin/downloads/batch-launch-0.7.0.jar
43+
- https://github.com/VUIIS/dax/raw/main/misc/xnat-plugins/dax-plugin-genProcData-1.4.2.jar

‎playbooks/molecule/rocky8_omero/molecule.yml

+2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ provisioner:
8989
verify: ../resources/omero/verify.yml
9090
env:
9191
ANSIBLE_VERBOSITY: "1"
92+
ANSIBLE_ROLES_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../roles/:~/.ansible/roles
93+
ANSIBLE_COLLECTIONS_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../../../:~/.ansible/collections
9294

9395
verifier:
9496
name: ansible

‎playbooks/molecule/rocky9_monitoring/molecule.yml

+2
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ provisioner:
8484
verify: ../resources/monitoring/verify.yml
8585
env:
8686
ANSIBLE_VERBOSITY: "1"
87+
ANSIBLE_ROLES_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../roles/:~/.ansible/roles
88+
ANSIBLE_COLLECTIONS_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../../../:~/.ansible/collections
8789

8890
verifier:
8991
name: ansible

‎playbooks/molecule/rocky9_xnat/molecule.yml

+2
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ provisioner:
119119
verify: ../resources/xnat/verify.yml
120120
env:
121121
ANSIBLE_VERBOSITY: "1"
122+
ANSIBLE_ROLES_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../roles/:~/.ansible/roles
123+
ANSIBLE_COLLECTIONS_PATH: ${MOLECULE_SCENARIO_DIRECTORY}/../../../../../../:~/.ansible/collections
122124

123125
verifier:
124126
name: ansible

‎roles/xnat/defaults/main.yml

-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ xnat_ldap_keystore_alias: ""
4141
xnat_plugin_urls:
4242
- https://api.bitbucket.org/2.0/repositories/xnatdev/xsync/downloads/xsync-plugin-all-1.8.1.jar
4343
- https://api.bitbucket.org/2.0/repositories/xnatx/ldap-auth-plugin/downloads/ldap-auth-plugin-1.1.0.jar
44-
- https://api.bitbucket.org/2.0/repositories/xnatdev/container-service/downloads/container-service-3.6.2-fat.jar
45-
- https://api.bitbucket.org/2.0/repositories/xnatx/xnatx-batch-launch-plugin/downloads/batch-launch-0.7.0.jar
46-
- https://github.com/VUIIS/dax/raw/main/misc/xnat-plugins/dax-plugin-genProcData-1.4.2.jar
4744
- https://api.bitbucket.org/2.0/repositories/icrimaginginformatics/ohif-viewer-xnat-plugin/downloads/ohif-viewer-3.7.0-XNAT-1.8.10.jar
4845
- https://api.bitbucket.org/2.0/repositories/xnatx/ml-schema-plugin/downloads/ml-schema-plugin-1.0.0.jar
4946
- https://api.bitbucket.org/2.0/repositories/xnatx/datasets-schema-plugin/downloads/datasets-schema-plugin-1.0.0.jar

0 commit comments

Comments
 (0)