ci: use VM_DRIVER=podman for AWS virtual-machines

With the CentOS CI machines moving to AWS EC2 virtual-machines, there is
no option to run minikube with a VM anymore. Instead, run minikube with
the Podman driver and partition the extra xvdb EBS volume into three
pieces.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2022-10-07 17:38:34 +02:00 committed by mergify[bot]
parent 7681ef27ff
commit 893da82f71
2 changed files with 34 additions and 9 deletions

View File

@ -7,6 +7,12 @@
# well. # well.
# #
# no need to ssh-copy images if there is no VM
if [[ "${VM_DRIVER}" == "none" ]] || [[ "${VM_DRIVER}" == "podman" ]]
then
exit 0
fi
# fail when a command returns an error # fail when a command returns an error
set -e -o pipefail set -e -o pipefail

View File

@ -64,7 +64,7 @@ function set_env() {
CSI_IMAGE_VERSION=${CSI_IMAGE_VERSION:-"canary"} CSI_IMAGE_VERSION=${CSI_IMAGE_VERSION:-"canary"}
export GO111MODULE="on" export GO111MODULE="on"
export TEST_COVERAGE="stdout" export TEST_COVERAGE="stdout"
export VM_DRIVER="kvm2" export VM_DRIVER="podman"
export MEMORY="14336" export MEMORY="14336"
export NUM_DISKS="3" export NUM_DISKS="3"
export DISK_SIZE="32gb" export DISK_SIZE="32gb"
@ -86,13 +86,32 @@ function set_env() {
export PATH=$PATH:/usr/local/bin export PATH=$PATH:/usr/local/bin
} }
# prepare_disks uses the /dev/xvdb EBS device (40GB) and creates 3 12GB
# partitions on it. The function uses 'fdisk' with a script that has empty
# lines for default values while fdisk prompts for them.
function prepare_disks() {
fdisk /dev/xvdb << EOS
n
p
+12G
n
p
+12G
n
p
+12G
w
EOS
}
function install_minikube() function install_minikube()
{ {
dnf -y groupinstall 'Virtualization Host'
systemctl enable --now libvirtd
# Warning about "No ACPI IVRS table found", not critical
virt-host-validate || true
# minikube needs socat # minikube needs socat
dnf -y install socat dnf -y install socat
@ -107,9 +126,6 @@ function install_minikube()
# minikube 1.25.2 adds the GOARCH to the path ("amd64" in our CI) # minikube 1.25.2 adds the GOARCH to the path ("amd64" in our CI)
cp ~/.minikube/cache/linux/amd64/"${k8s_version}"/kubectl /usr/bin/ cp ~/.minikube/cache/linux/amd64/"${k8s_version}"/kubectl /usr/bin/
fi fi
# scan for extra disks
minikube ssh 'echo 1 | sudo tee /sys/bus/pci/rescan > /dev/null ; dmesg | grep virtio_blk'
} }
function deploy_rook() function deploy_rook()
@ -129,6 +145,9 @@ function deploy_rook()
# Set environment variables # Set environment variables
set_env set_env
# create disk partitions
prepare_disks
# prepare minikube environment # prepare minikube environment
install_minikube install_minikube