Skip to content

Commit ae32193

Browse files
committed
Use additional RPM repos in Initial Setup reboot tests
Use the library functions that enable access to additional RPM repos in the Initial Setup reboot tests. These tests aim is to verify that latest Anaconda changes have not broken Initial Setup. To do this they need an Anaconda scratchbuild with the latest changes (usually still in PR form) to be injected to the package installation transaction as otherwise the stable released package from the main repo would be installed and no breakage could be uncovered.
1 parent 0425e07 commit ae32193

3 files changed

Lines changed: 52 additions & 0 deletions

File tree

initial-setup-gui.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,26 @@ TESTTYPE="initial-setup"
2222
. ${KSTESTDIR}/functions.sh
2323
. ${KSTESTDIR}/validate-lib-initial-setup.sh
2424

25+
prepare() {
26+
ks=$1
27+
tmpdir=$2
28+
export_additional_repo $tmpdir
29+
echo $ks
30+
}
31+
32+
kernel_args() {
33+
echo $(append_additional_repo_to_kernel_args $DEFAULT_BOOTOPTS)
34+
}
35+
36+
cleanup() {
37+
tmpdir=$1
38+
39+
# cleanup the localhost webserver we might have started
40+
if [ -f ${tmpdir}/httpd-pid ]; then
41+
kill $(cat ${tmpdir}/httpd-pid)
42+
fi
43+
}
44+
2545
validate() {
2646
# check IS is disabled via validation library function
2747
validate_post_install_tools $1 0

reboot-initial-setup-gui.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,19 @@ TESTTYPE="reboot initial-setup"
2222
additional_runner_args() {
2323
echo "--wait"
2424
}
25+
26+
kernel_args() {
27+
echo $(append_additional_repo_to_kernel_args $DEFAULT_BOOTOPTS)
28+
}
29+
30+
prepare() {
31+
ks=$1
32+
tmpdir=$2
33+
export_additional_repo $tmpdir
34+
echo $ks
35+
}
36+
37+
cleanup() {
38+
local tmp_dir="${1}"
39+
stop_httpd "${tmp_dir}"
40+
}

reboot-initial-setup-tui.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,19 @@ TESTTYPE="reboot initial-setup fedora-only"
2424
additional_runner_args() {
2525
echo "--wait"
2626
}
27+
28+
kernel_args() {
29+
echo $(append_additional_repo_to_kernel_args $DEFAULT_BOOTOPTS)
30+
}
31+
32+
prepare() {
33+
ks=$1
34+
tmpdir=$2
35+
export_additional_repo $tmpdir
36+
echo $ks
37+
}
38+
39+
cleanup() {
40+
local tmp_dir="${1}"
41+
stop_httpd "${tmp_dir}"
42+
}

0 commit comments

Comments
 (0)