Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

cri-o: tests: use devicemapper on all ubuntu versions #1494

Merged
merged 1 commit into from
Apr 25, 2019
Merged

cri-o: tests: use devicemapper on all ubuntu versions #1494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions integration/cri-o/cri-o.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down