Skip to content

Commit

Permalink
Cirrus: Bump Fedora to release 35
Browse files Browse the repository at this point in the history
The Fedora 35 cloud images have switched to UEFI boot with a GPT
partition. Formerly, all Fedora images included support for runtime
re-partitioning. However, the requirement to test alternate storage
has since been dropped/removed.  Rather than maintain a disused
feature, and supporting scripts, these Fedora VM images have reverted
to the default: Automatically resize to 100% on boot.

Signed-off-by: Chris Evich <[email protected]>
  • Loading branch information
cevich committed Oct 28, 2021
1 parent 2ebd055 commit adb568d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 75 deletions.
9 changes: 3 additions & 6 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ env:
####
# GCE project where images live
IMAGE_PROJECT: "libpod-218412"
FEDORA_NAME: "fedora-34"
PRIOR_FEDORA_NAME: "fedora-33"
FEDORA_NAME: "fedora-35"
PRIOR_FEDORA_NAME: "fedora-34"
UBUNTU_NAME: "ubuntu-2104"

IMAGE_SUFFIX: "c6431352024203264"
IMAGE_SUFFIX: "c5993382683082752"
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"
Expand Down Expand Up @@ -216,9 +216,6 @@ static_build_task:
init_script: |
set -ex
setenforce 0
growpart /dev/sda 1 || true
resize2fs /dev/sda1 || true
yum -y install podman
nix_cache:
folder: '.cache'
Expand Down
63 changes: 0 additions & 63 deletions contrib/cirrus/add_second_partition.sh

This file was deleted.

6 changes: 0 additions & 6 deletions contrib/cirrus/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ echo "Setting up $OS_RELEASE_ID $OS_RELEASE_VER"
cd $GOSRC
case "$OS_RELEASE_ID" in
fedora)
# Not executing IN_PODMAN container
if [[ -z "$CONTAINER" ]]; then
warn "Adding secondary testing partition & growing root filesystem"
bash $SCRIPT_BASE/add_second_partition.sh
fi

warn "Hard-coding podman to use crun"
cat > /etc/containers/containers.conf <<EOF
[engine]
Expand Down

0 comments on commit adb568d

Please sign in to comment.