Skip to content

Commit b64f65d

Browse files
committed
make all molecule tests configless
1 parent d14d687 commit b64f65d

File tree

14 files changed

+10
-94
lines changed

14 files changed

+10
-94
lines changed

molecule/README.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,23 @@ Test options in "Other" column flow down through table unless changed.
66

77
Test | # Partitions | Groups in partitions? | Other
88
--- | --- | --- | ---
9-
test1 | 1 | N | 2x compute node, sequential names (default test), config on all nodes
9+
test1 | 1 | N | 2x compute node, sequential names (default test)
1010
test1b | 1 | N | 1x compute node
1111
test1c | 1 | N | 2x compute nodes, nonsequential names
1212
test2 | 2 | N | 4x compute node, sequential names
1313
test3 | 1 | Y | 4x compute nodes in 2x groups, single partition
1414
test4 | 1 | N | 2x compute node, accounting enabled
15-
test5 | 1 | N | As for #1 but configless
16-
test6 | 1 | N | 0x compute nodes, configless
15+
test5 | - | - | [removed, now always configless]
16+
test6 | 1 | N | 0x compute nodes
1717
test7 | 1 | N | [removed, image build should just run install.yml task, this is not expected to work]
18-
test8 | 1 | N | 2x compute node, 2x login-only nodes, configless
18+
test8 | 1 | N | 2x compute node, 2x login-only nodes
1919
test9 | 1 | N | As test8 but uses `--limit=testohpc-control,testohpc-compute-0` and checks login nodes still end up in slurm.conf
20-
test10 | 1 | N | As for #5 but then tries to add an additional node
21-
test11 | 1 | N | As for #5 but then deletes a node (actually changes the partition due to molecule/ansible limitations)
22-
test12 | 1 | N | As for #5 but enabling job completion and testing `sacct -c`
23-
test13 | 1 | N | As for #5 but tests `openhpc_config` variable.
24-
test14 | 1 | N | [removed, extra_nodes removed]
25-
test15 | 1 | Y | As for #5 but also tests `partitions with different name but with the same NodeName`.
26-
20+
test10 | 1 | N | As for #1 but then tries to add an additional node
21+
test11 | 1 | N | As for #1 but then deletes a node (actually changes the partition due to molecule/ansible limitations)
22+
test12 | 1 | N | As for #1 but enabling job completion and testing `sacct -c`
23+
test13 | 1 | N | As for #1 but tests `openhpc_config` variable.
24+
test14 | - | - | [removed, extra_nodes removed]
25+
test15 | 1 | Y | As for #1 but also tests partitions with different name but with the same NodeName.
2726

2827
# Local Installation & Running
2928

molecule/test10/converge.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
openhpc_nodegroups:
1111
- name: "compute"
1212
openhpc_cluster_name: testohpc
13-
openhpc_slurm_configless: true
1413
tasks:
1514
- name: "Include ansible-role-openhpc"
1615
include_role:

molecule/test10/verify.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
openhpc_nodegroups:
3333
- name: "compute"
3434
openhpc_cluster_name: testohpc
35-
openhpc_slurm_configless: true
3635

3736
- name: Check modified cluster has 3x nodes
3837
hosts: testohpc_login

molecule/test11/converge.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@
1414
openhpc_nodegroups:
1515
- name: "compute_orig"
1616
openhpc_cluster_name: testohpc
17-
openhpc_slurm_configless: true

molecule/test11/verify.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
openhpc_nodegroups:
3030
- name: "compute_new"
3131
openhpc_cluster_name: testohpc
32-
openhpc_slurm_configless: true
3332

3433
- name: Check modified cluster has 1x nodes
3534
hosts: testohpc_login

molecule/test12/converge.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@
1414
openhpc_nodegroups:
1515
- name: "compute"
1616
openhpc_cluster_name: testohpc
17-
openhpc_slurm_configless: true
1817
openhpc_slurm_job_comp_type: jobcomp/filetxt

molecule/test13/converge.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
openhpc_nodegroups:
1111
- name: "compute"
1212
openhpc_cluster_name: testohpc
13-
openhpc_slurm_configless: true
1413
openhpc_login_only_nodes: 'testohpc_login'
1514
openhpc_config:
1615
FirstJobId: 13

molecule/test15/converge.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
Default: false
2121
AllowAccounts: Group_own_thePartition
2222
openhpc_cluster_name: testohpc
23-
openhpc_slurm_configless: true
2423
tasks:
2524
- name: "Include ansible-role-openhpc"
2625
include_role:

molecule/test5/converge.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

molecule/test5/molecule.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)