srbala
/
os-autoinst-distri-fedora
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
1
0
Fork 0
Code Issues Releases Activity

Don't update system in repo_setup on update install tests 

When I enabled _advisory_post for live and ostree install tests,
the point was to check that updated packages were included in
the install media and used during installation. We shouldn't run
a system update in _repo_setup_updates on this path because it
will hide the problem if the updated packages weren't included.
The INSTALL variable is for this purpose - it was previously
used to skip _advisory_post on the same path. At the same time
let's remove some stray settings of this var on non-update tests
as it serves no purpose there.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2022-12-09 13:07:15 -08:00
parent 5698525cc7
commit 7429b438fd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/utils.pm
View File

@ -666,8 +666,11 @@ sub _repo_setup_updates {
# it on the actual support_server system)
unless (get_var("TEST") eq "support_server" && $version ne get_var("CURRREL")) {
assert_script_run 'printf "[advisory]\nname=Advisory repo\nbaseurl=file:///mnt/update_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0" > /etc/yum.repos.d/advisory.repo';
# run an update now (except for upgrade or CANNED tests)
script_run "dnf -y update", 900 unless (get_var("UPGRADE") || get_var("CANNED"));
# run an update now, except for upgrade or install tests,
# where the updated packages should have been installed
# already and we want to fail if they weren't, or CANNED
# tests, there's no point updating the toolbox
script_run "dnf -y update", 900 unless (get_var("UPGRADE") || get_var("INSTALL") || get_var("CANNED"));
}
# exit the toolbox on CANNED
if (get_var("CANNED")) {

3
templates.fif.json
View File

@ -860,7 +860,6 @@
"settings": {
"PARTITIONING": "custom_blivet_resize_lvm",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"INSTALL": "1",
"POSTINSTALL": "disk_custom_resize_lvm_postinstall",
"ROOT_PASSWORD": "weakpassword",
"START_AFTER_TEST": "install_lvm_ext4"
@ -875,7 +874,6 @@
"settings": {
"PARTITIONING": "custom_resize_lvm",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"INSTALL": "1",
"ROOT_PASSWORD": "weakpassword",
"START_AFTER_TEST": "install_lvm_ext4"
}
@ -1453,7 +1451,6 @@
},
"settings": {
"PARTITIONING": "custom_btrfs_preserve_home",
"INSTALL": 1,
"ROOT_PASSWORD": "weakpassword",
"POSTINSTALL": "btrfs_preserve_home_check_content",
"HDD_1": "disk_f%CURRREL%_desktop_4_%ARCH%.qcow2"