jenkins-builder-disk: Support disk flipping on adami too

Signed-off-by: David Galloway <david.galloway@ibm.com>

diff --git a/tools/jenkins-builder-disk.yml b/tools/jenkins-builder-disk.yml
index f5943a74f96d7960acb6d162a9a8e644740e6cd4..567911299d2dfb6756f69a21bac3c7e68e2a72bb 100644 (file)
--- a/tools/jenkins-builder-disk.yml
+++ b/tools/jenkins-builder-disk.yml
@@ -10,41 +10,46 @@
   become: true
   tasks:
 
-# CentOS 9 on the braggi nodes likes to flip around which disk is sda and which is sdb.  Sometimes it comes up as sdb and sometimes sda.
-  - name: Check if /dev/sda is the 400GB disk on a braggi
+# CentOS 9 on these nodes likes to flip around which disk is sda and which is sdb.
+# We pick the ~400GB disk by choosing the one < 500 GiB.
+  - set_fact:
+      jenkins_slave_mount_point: /home/jenkins-build
+      disk_flip_host: "{{ ('braggi' in ansible_hostname) or ('adami' in ansible_hostname) }}"
+  
+  - name: Check if /dev/sda is the 400GB disk (braggi/adami)
     parted:
       device: "/dev/sda"
       unit: GiB
-    register: "sda_parted"
-    when: '"braggi" in ansible_hostname'
-
-  - name: Check if /dev/sdb is the 400GB disk on a braggi
+    register: sda_parted
+    when: disk_flip_host
+  
+  - name: Check if /dev/sdb is the 400GB disk (braggi/adami)
     parted:
       device: "/dev/sdb"
       unit: GiB
-    register: "sdb_parted"
-    when: '"braggi" in ansible_hostname'
-
-  - set_fact:
-      mount_point: /home/jenkins-build
-    when: '"braggi" in ansible_hostname'
-
-  - set_fact:
+    register: sdb_parted
+    when: disk_flip_host
+  
+  - name: Set mount_point for jenkins-build (braggi/adami)
+    set_fact:
+      mount_point: "{{ jenkins_slave_mount_point }}"
+    when: disk_flip_host
+  
+  - name: Select 400GB disk as /dev/sda (braggi/adami)
+    set_fact:
       disk: /dev/sda
     when:
-      - '"braggi" in ansible_hostname'
-      - "sda_parted.disk.size < 500"
-
-  - set_fact:
+      - disk_flip_host
+      - sda_parted.disk.size is defined
+      - sda_parted.disk.size < 500
+  
+  - name: Select 400GB disk as /dev/sdb (braggi/adami)
+    set_fact:
       disk: /dev/sdb
     when:
-      - '"braggi" in ansible_hostname'
-      - "sdb_parted.disk.size < 500"
-
-  - set_fact:
-      disk: /dev/sdb
-      mount_point: /home/jenkins-build
-    when: '"adami" in ansible_hostname'
+      - disk_flip_host
+      - sdb_parted.disk.size is defined
+      - sdb_parted.disk.size < 500
 
   - set_fact:
       disk: /dev/nvme0n1