From 32dd9cb614e76217f056419c635e2b69ffa1dd97 Mon Sep 17 00:00:00 2001
From: Xiaofeng Wang <henrywangxf@me.com>
Date: Tue, 13 Apr 2021 15:44:53 +0800
Subject: [PATCH] test: Simply .ks and add edge repo setup in .ks

1. Make .ks as simple as possible. only keep must-have options
2. Add edge repo setup in .ks instead of after installation
---
 test/cases/ostree-ng.sh | 33 +++------------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/test/cases/ostree-ng.sh b/test/cases/ostree-ng.sh
index e059a6343..fc7b24e98 100755
--- a/test/cases/ostree-ng.sh
+++ b/test/cases/ostree-ng.sh
@@ -358,14 +358,6 @@ sudo qemu-img create -f qcow2 "${LIBVIRT_IMAGE_PATH}" 20G
 greenprint "📑 Generate kickstart file"
 tee "$KS_FILE" > /dev/null << STOPHERE
 text
-lang en_US.UTF-8
-keyboard us
-timezone --utc Etc/UTC
-
-selinux --enforcing
-
-bootloader --timeout=1 --append="net.ifnames=0 modprobe.blacklist=vc4"
-
 network --bootproto=dhcp --device=link --activate --onboot=on
 
 zerombr
@@ -379,23 +371,9 @@ poweroff
 # no sudo password for user admin
 echo -e 'admin\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
 
-# Remove any persistent NIC rules generated by udev
-rm -vf /etc/udev/rules.d/*persistent-net*.rules
-# And ensure that we will do DHCP on eth0 on startup
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF
-
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
-
+# delete local ostree repo and add external prod edge repo
+ostree remote delete rhel-edge
+ostree remote add --no-gpg-verify --no-sign-verify rhel-edge ${PROD_REPO_URL}
 %end
 STOPHERE
 
@@ -523,11 +501,6 @@ greenprint "🧽 Clean up upgrade blueprint and compose"
 sudo composer-cli compose delete "${COMPOSE_ID}" > /dev/null
 sudo composer-cli blueprints delete upgrade > /dev/null
 
-# Config remote repository for upgrade
-greenprint "🔗 Config remote repository for upgrade"
-sudo ssh "${SSH_OPTIONS[@]}" -i "${SSH_KEY}" admin@${GUEST_ADDRESS} 'sudo ostree remote delete rhel-edge'
-sudo ssh "${SSH_OPTIONS[@]}" -i "${SSH_KEY}" admin@${GUEST_ADDRESS} "sudo ostree remote add --no-gpg-verify --no-sign-verify rhel-edge ${PROD_REPO_URL}"
-
 # Upgrade image/commit.
 greenprint "🗳 Upgrade ostree image/commit"
 sudo ssh "${SSH_OPTIONS[@]}" -i "${SSH_KEY}" admin@${GUEST_ADDRESS} 'sudo rpm-ostree upgrade'