summaryrefslogtreecommitdiff
path: root/contrib/cirrus/setup_environment.sh
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-19 16:13:47 +0200
committerGitHub <noreply@github.com>2019-06-19 16:13:47 +0200
commit7be87f5551ca36d30518dcd62d623c4d45bb830b (patch)
tree61f121eaa333ccd70bf80bca68221aca19d9beb4 /contrib/cirrus/setup_environment.sh
parent589b12dbc9e4efab3e98cda01b1e47f93e846586 (diff)
parentab3105a46d18136c8be7416b46100df23282b9a1 (diff)
downloadpodman-7be87f5551ca36d30518dcd62d623c4d45bb830b.tar.gz
podman-7be87f5551ca36d30518dcd62d623c4d45bb830b.tar.bz2
podman-7be87f5551ca36d30518dcd62d623c4d45bb830b.zip
Merge pull request #3078 from cevich/cirrus_f30
Cirrus F30
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh16
1 files changed, 2 insertions, 14 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 13bce506a..8fdcf5897 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -33,20 +33,8 @@ done
# (see docs).
case "${OS_REL_VER}" in
ubuntu-18) ;;
- fedora-29)
- # Occasionally, and seemingly only on F29 the root disk fails to expand
- # upon boot. When this happens, any number of failures could occur if
- # space runs out. Until there is time to investigate the actual cause,
- # workaround this problem by detecting it and acting accordingly.
- REMAINING=$(df /dev/sda1 | tail -1 | awk '{print $4}')
- if [[ "$REMAINING" -lt "100000000" ]] # .cirrus.yml specifies 200gig
- then
- echo "Fixing failure to expand root filesystem"
- growpart /dev/sda 1 # device guaranteed by cloud provider
- resize2fs /dev/sda1 # growpart & resuze guaranteed by base-image
- fi
- ;;
- fedora-28) ;;
+ fedora-30) ;;
+ fedora-29) ;;
centos-7) # Current VM is an image-builder-image no local podman/testing
echo "No further setup required for VM image building"
exit 0