From b2300b08353a495287a827b6f909fabe5488fa56 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Tue, 7 Sep 2021 15:19:18 +0530 Subject: [PATCH] ci: use internal minikube extra disks functionality Minikube from v1.23.0 supports adding extra disks in kvm2 and hyperkit VM drivers. This commit makes use of that functionality and removes steps to attack disks externally. Signed-off-by: Rakshith R --- single-node-k8s.sh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/single-node-k8s.sh b/single-node-k8s.sh index 42d2d30d0..a2ca6168f 100755 --- a/single-node-k8s.sh +++ b/single-node-k8s.sh @@ -66,6 +66,8 @@ function set_env() { export TEST_COVERAGE="stdout" export VM_DRIVER="kvm2" export MEMORY="14336" + export NUM_DISKS="3" + export DISK_SIZE="32gb" export CEPH_CSI_RUN_ALL_TESTS=true # downloading rook images is sometimes slow, extend timeout to 15 minutes export ROOK_VERSION=${ROOK_VERSION:-'v1.3.9'} @@ -100,18 +102,7 @@ function install_minikube() # copy kubectl from minikube to /usr/bin cp ~/.minikube/cache/linux/"${k8s_version}"/kubectl /usr/bin/ - # add disks to the minikube VM - if [ ! -d /opt/minikube/images ]; then - mkdir -p /opt/minikube/images - virsh pool-create-as --name minikube --type dir --target /opt/minikube/images - fi - virsh vol-create-as --pool minikube --name osd-0 --capacity 32G - virsh vol-create-as --pool minikube --name osd-1 --capacity 32G - virsh vol-create-as --pool minikube --name osd-2 --capacity 32G - virsh attach-disk --domain minikube --source /opt/minikube/images/osd-0 --target vdb - virsh attach-disk --domain minikube --source /opt/minikube/images/osd-1 --target vdc - virsh attach-disk --domain minikube --source /opt/minikube/images/osd-2 --target vdd - # rescan for newly attached virtio devices + # scan for extra disks minikube ssh 'echo 1 | sudo tee /sys/bus/pci/rescan > /dev/null ; dmesg | grep virtio_blk' }