srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-25 15:23:08 +00:00
Code Issues Releases Activity

Try and fix Cockpit tests breaking with update ISO change

Browse Source 
We drop the line for the update ISO from /etc/fstab before
uploading the image after the cockpit_default test, but we don't
make sure it's set up again before Cockpit tries to use it, in
the subsequent Cockpit tests. I don't know why this didn't fail
on stg before, but it sure as hell is failing in prod...

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-06-20 15:13:14 +02:00
parent 74730f904a
commit 6fefd092e9
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/utils.pm
View File

@ -540,11 +540,11 @@ sub _repo_setup_compose {
sub _repo_setup_updates { sub _repo_setup_updates {
# Appropriate repo setup steps for testing a Bodhi update # Appropriate repo setup steps for testing a Bodhi update
# Check if we already ran, bail if so
return unless script_run "test -f /root/.oqarsurun";
# sanity check # sanity check
die "_repo_setup_updates called, but ISO_2 is not attached!" unless (get_var("ISO_2")); die "_repo_setup_updates called, but ISO_2 is not attached!" unless (get_var("ISO_2"));
mount_update_image; mount_update_image;
# Check if we already ran, bail if so
return unless script_run "test -f /root/.oqarsurun";
my $version = get_var("VERSION"); my $version = get_var("VERSION");
my $currrel = get_var("CURRREL", "0"); my $currrel = get_var("CURRREL", "0");
my $arch = get_var("ARCH"); my $arch = get_var("ARCH");

3
tests/server_cockpit_autoupdate.pm
View File

@ -7,6 +7,9 @@ use cockpit;
sub run { sub run {
my $self = shift; my $self = shift;
# on update flow, we need to ensure the ISO is mounted. this would
# be harmless but waste time on compose flow
repo_setup if (get_var("ADVISORY_OR_TASK"));
# Start Cockpit # Start Cockpit
start_cockpit(login => 1); start_cockpit(login => 1);

3
tests/server_cockpit_updates.pm
View File

@ -7,6 +7,9 @@ use cockpit;
sub run { sub run {
my $self = shift; my $self = shift;
# on update flow, we need to ensure the ISO is mounted. this would
# be harmless but waste time on compose flow
repo_setup if (get_var("ADVISORY_OR_TASK"));
my $cockdate = "0"; my $cockdate = "0";
# Remove a package, disable repositories and enable test repositories, install the package # Remove a package, disable repositories and enable test repositories, install the package