Merge pull request #6241 from travisn/backport-ci-disk

ci: Change name of the disk used in the build

tests/framework/installer/ceph_installer.go

@@ -826,7 +826,7 @@ spec:
                       done
                       # Wipe the specific disk in the CI that was running in raw mode
                       set +Ee
-                      block=/dev/xvdc
+                      block=/dev/nvme0n1
                       wipefs --all "$block"
                       dd if=/dev/zero of="$block" bs=1M count=100 oflag=direct,dsync
                       set -Ee

tests/scripts/localPathPV.sh

@@ -20,15 +20,15 @@ metadata:
   labels:
     type: local
 spec:
-  storageClassName: manual 
+  storageClassName: manual
   capacity:
     storage: 5Gi
   accessModes:
-    - ReadWriteOnce 
+    - ReadWriteOnce
   persistentVolumeReclaimPolicy: Retain
   volumeMode: Filesystem
   local:
-    path: "/var/lib/rook/${random_string}/mon1" 
+    path: "/var/lib/rook/${random_string}/mon1"
   nodeAffinity:
       required:
         nodeSelectorTerms:
@@ -45,15 +45,15 @@ metadata:
   labels:
     type: local
 spec:
-  storageClassName: manual 
+  storageClassName: manual
   capacity:
     storage: 5Gi
   accessModes:
-    - ReadWriteOnce 
+    - ReadWriteOnce
   persistentVolumeReclaimPolicy: Retain
   volumeMode: Filesystem
   local:
-    path: "/var/lib/rook/${random_string}/mon2" 
+    path: "/var/lib/rook/${random_string}/mon2"
   nodeAffinity:
       required:
         nodeSelectorTerms:
@@ -70,15 +70,15 @@ metadata:
   labels:
     type: local
 spec:
-  storageClassName: manual 
+  storageClassName: manual
   capacity:
     storage: 5Gi
   accessModes:
-    - ReadWriteOnce 
+    - ReadWriteOnce
   persistentVolumeReclaimPolicy: Retain
   volumeMode: Filesystem
   local:
-    path: "/var/lib/rook/${random_string}/mon3" 
+    path: "/var/lib/rook/${random_string}/mon3"
   nodeAffinity:
       required:
         nodeSelectorTerms:
@@ -95,15 +95,15 @@ metadata:
   labels:
     type: local
 spec:
-  storageClassName: manual 
+  storageClassName: manual
   capacity:
     storage: 10Gi
   accessModes:
-    - ReadWriteOnce 
+    - ReadWriteOnce
   persistentVolumeReclaimPolicy: Retain
   volumeMode: Block
   local:
-    path: "/dev/xvdc" 
+    path: "/dev/nvme0n1"
   nodeAffinity:
       required:
         nodeSelectorTerms:
@@ -119,4 +119,4 @@ metadata:
   name: manual
 provisioner: kubernetes.io/no-provisioner
 volumeBindingMode: WaitForFirstConsumer
-eof
\ No newline at end of file
+eof