From 7f52bd8437dd907dec7d7a926b25b0f56b1c4c49 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Wed, 29 Sep 2021 16:47:07 -0400
Subject: Cirrus: Bump Fedora to release 35

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 <cevich@redhat.com>
---
 contrib/cirrus/add_second_partition.sh | 63 ----------------------------------
 contrib/cirrus/setup_environment.sh    | 12 ++-----
 2 files changed, 2 insertions(+), 73 deletions(-)
 delete mode 100644 contrib/cirrus/add_second_partition.sh

(limited to 'contrib/cirrus')

diff --git a/contrib/cirrus/add_second_partition.sh b/contrib/cirrus/add_second_partition.sh
deleted file mode 100644
index 322dd2512..000000000
--- a/contrib/cirrus/add_second_partition.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-
-# N/B: This script could mega f*!@up your disks if run by mistake.
-#      it is left without the execute-bit on purpose!
-
-set -eo pipefail
-
-# shellcheck source=./lib.sh
-source $(dirname $0)/lib.sh
-
-# $SLASH_DEVICE is the disk device to be f*xtuP
-SLASH_DEVICE="/dev/sda"  # Always the case on GCP
-
-# The unallocated space results from the difference in disk-size between VM Image
-# and runtime request.
-NEW_PART_START="50%"
-NEW_PART_END="100%"
-
-
-if [[ ! -r "/root" ]] || [[ -r "/root/second_partition_ready" ]]
-then
-    warn "Ignoring attempted execution of $(basename $0)"
-    exit 0
-fi
-
-[[ -x "$(type -P parted)" ]] || \
-    die "The parted command is required."
-
-[[ ! -b ${SLASH_DEVICE}2 ]] || \
-    die "Found unexpected block device ${SLASH_DEVICE}2"
-
-PPRINTCMD="parted --script ${SLASH_DEVICE} print"
-FINDMNTCMD="findmnt --source=${SLASH_DEVICE}1 --mountpoint=/ --canonicalize --evaluate --first-only --noheadings"
-TMPF=$(mktemp -p '' $(basename $0)_XXXX)
-trap "rm -f $TMPF" EXIT
-
-if $FINDMNTCMD | tee $TMPF | egrep -q "^/\s+${SLASH_DEVICE}1"
-then
-    msg "Repartitioning original partition table:"
-    $PPRINTCMD
-else
-    die "Unexpected output from '$FINDMNTCMD': $(<$TMPF)"
-fi
-
-echo "Adding partition offset within unpartitioned space."
-parted --script --align optimal /dev/sda unit % mkpart primary "" "" "$NEW_PART_START" "$NEW_PART_END"
-
-msg "New partition table:"
-$PPRINTCMD
-
-msg "Growing ${SLASH_DEVICE}1 meet start of ${SLASH_DEVICE}2"
-growpart ${SLASH_DEVICE} 1
-
-FSTYPE=$(findmnt --first-only --noheadings --output FSTYPE ${SLASH_DEVICE}1)
-echo "Expanding $FSTYPE filesystem on ${SLASH_DEVICE}1"
-case $FSTYPE in
-    ext*) resize2fs ${SLASH_DEVICE}1 ;;
-    *) die "Script $(basename $0) doesn't know how to resize a $FSTYPE filesystem." ;;
-esac
-
-# Must happen last - signals completion to other tooling
-msg "Recording newly available disk partition device into /root/second_partition_ready"
-echo "${SLASH_DEVICE}2" > /root/second_partition_ready
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 1a07aeffc..8f535c7e7 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -119,12 +119,6 @@ case "$OS_RELEASE_ID" in
     ubuntu) ;;
     fedora)
         if ((CONTAINER==0)); then
-            msg "Configuring / Expanding host storage."
-            # VM is setup to allow flexibility in testing alternate storage.
-            # For general use, simply make use of all available space.
-            bash "$SCRIPT_BASE/add_second_partition.sh"
-            $SCRIPT_BASE/logcollector.sh df
-
             # All SELinux distros need this for systemd-in-a-container
             msg "Enabling container_manage_cgroup"
             setsebool container_manage_cgroup true
@@ -224,10 +218,8 @@ case "$TEST_FLAVOR" in
         remove_packaged_podman_files
         make install PREFIX=/usr ETCDIR=/etc
 
-        # TODO: Don't install stuff at test runtime!  Do this from
-        # cache_images/fedora_packaging.sh in containers/automation_images
-        # and STRONGLY prefer installing RPMs vs pip packages in venv
-        dnf install -y python3-virtualenv python3-pytest4
+        msg "Installing previously downloaded/cached packages"
+        dnf install -y $PACKAGE_DOWNLOAD_DIR/python3*.rpm
         virtualenv venv
         source venv/bin/activate
         pip install --upgrade pip
-- 
cgit v1.2.3-54-g00ecf