particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: Simply .ks and add edge repo setup in .ks

Browse source 
1. Make .ks as simple as possible. only keep must-have options
2. Add edge repo setup in .ks instead of after installation
This commit is contained in:
Xiaofeng Wang 2021-04-13 15:44:53 +08:00
parent 260fdb053f
commit 32dd9cb614
1 changed files with 3 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

33
test/cases/ostree-ng.sh
View file

@ -358,14 +358,6 @@ sudo qemu-img create -f qcow2 "${LIBVIRT_IMAGE_PATH}" 20G
greenprint "📑 Generate kickstart file" greenprint "📑 Generate kickstart file"
tee "$KS_FILE" > /dev/null << STOPHERE tee "$KS_FILE" > /dev/null << STOPHERE
text 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 network --bootproto=dhcp --device=link --activate --onboot=on
zerombr zerombr
@ -379,23 +371,9 @@ poweroff
# no sudo password for user admin # no sudo password for user admin
echo -e 'admin\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers echo -e 'admin\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
# Remove any persistent NIC rules generated by udev # delete local ostree repo and add external prod edge repo
rm -vf /etc/udev/rules.d/*persistent-net*.rules ostree remote delete rhel-edge
# And ensure that we will do DHCP on eth0 on startup ostree remote add --no-gpg-verify --no-sign-verify rhel-edge ${PROD_REPO_URL}
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.)"
%end %end
STOPHERE STOPHERE
@ -523,11 +501,6 @@ greenprint "🧽 Clean up upgrade blueprint and compose"
sudo composer-cli compose delete "${COMPOSE_ID}" > /dev/null sudo composer-cli compose delete "${COMPOSE_ID}" > /dev/null
sudo composer-cli blueprints delete upgrade > /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. # Upgrade image/commit.
greenprint "🗳 Upgrade ostree image/commit" greenprint "🗳 Upgrade ostree image/commit"
sudo ssh "${SSH_OPTIONS[@]}" -i "${SSH_KEY}" admin@${GUEST_ADDRESS} 'sudo rpm-ostree upgrade' sudo ssh "${SSH_OPTIONS[@]}" -i "${SSH_KEY}" admin@${GUEST_ADDRESS} 'sudo rpm-ostree upgrade'