Fix test partition command

UoB-HPC · Sep 29, 2024 · 8bdf02a · 8bdf02a
1 parent c21a7bc
commit 8bdf02a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/playbook-task-sync-nodes.yml b/playbook-task-sync-nodes.yml
@@ -47,6 +47,9 @@
         state: restarted
         enabled: true
 
+    - name: Reset all node states
+      ansible.builtin.shell: scontrol update NodeName=ALL State=IDLE
+
     - name: Setup warewulf node config
       template:
         src: nodes.conf.j2

diff --git a/staging.rb b/staging.rb
@@ -190,7 +190,6 @@ def self.write_inventory(pve_ip:, storage_pool:, extra_hosts:, host_common_hash:
 
     common_vars = common_vars(storage_pool)
     extra_inventory = {
-      "root_sshkeys": ssh_pub_keys,
       "ungrouped": {
         "hosts":
         extra_hosts.merge(

diff --git a/tasks/tests.yml b/tasks/tests.yml
@@ -19,15 +19,16 @@
     - df.rc != 0 or  'mgmt.{{domain}}:/mnt/rds1/home' not in df.stdout
 
 - name: Get srun node hostnames
-  ansible.builtin.shell: srun --nodelist={{node}} hostname
+  ansible.builtin.shell: srun --partition={{nodes[node].partition}} --nodelist={{node}} hostname
   register: srun
   until: srun.rc == 0
   retries: 30 # 3 minutes
   delay: 1
   loop: "{{nodes.keys()}}"
   loop_control: { loop_var: node }
 
-- ansible.builtin.fail:
+- name: Assert srun result is correct
+  ansible.builtin.fail:
     msg: "Bad srun outcome"
   when: result.rc != 0 or result.stdout.strip() != result.node
   loop: "{{srun.results}}"