From 77a8cd531aa5b9889fb109d5f6f7d81c54c877ab Mon Sep 17 00:00:00 2001 From: Salvador Fuentes Date: Mon, 22 Apr 2019 12:24:49 -0500 Subject: [PATCH] cri-o: tests: use devicemapper on all ubuntu versions Do not restrict ubuntu version to run with devicemapper. We have now moved most of our jobs to ubuntu 18.04 and we were not testing with devicemapper. With this change, we will test cri-o with devicemapper on all ubuntu versions. Fixes: #1493. Signed-off-by: Salvador Fuentes --- integration/cri-o/cri-o.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/integration/cri-o/cri-o.sh b/integration/cri-o/cri-o.sh index b06f6bbd4..7db009741 100755 --- a/integration/cri-o/cri-o.sh +++ b/integration/cri-o/cri-o.sh @@ -60,9 +60,8 @@ done IFS=$OLD_IFS -# run CRI-O tests using devicemapper on ubuntu 16.04 -MAJOR=$(echo "$VERSION_ID"|cut -d\. -f1) -if [ "$ID" == "ubuntu" ] && [ "$MAJOR" -eq 16 ]; then +# run CRI-O tests using devicemapper on ubuntu +if [ "$ID" == "ubuntu" ]; then # Block device attached to the VM where we run the CI # If the block device has a partition, cri-o will not be able to use it. export LVM_DEVICE @@ -72,13 +71,9 @@ if [ "$ID" == "ubuntu" ] && [ "$MAJOR" -eq 16 ]; then export STORAGE_OPTIONS="$DM_STORAGE_OPTIONS" fi -# But if on ubuntu 17.10 or newer, test using overlay +# On other distros or on ZUUL, use overlay. # This will allow us to run tests with at least 2 different # storage drivers. -if [ "$ID" == "ubuntu" ] && [ "$MAJOR" -ge 17 ]; then - export STORAGE_OPTIONS="$OVERLAY_STORAGE_OPTIONS" -fi - if [ "$ID" == "fedora" ] || [ "$ID" == "centos" ]; then export STORAGE_OPTIONS="$OVERLAY_STORAGE_OPTIONS" fi