Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/main_containers.pm
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ sub load_compose_tests {

sub load_firewall_test {
return if (is_public_cloud || is_openstack || is_microos ||
(is_sle('>=16.0') && is_transactional()) ||
get_var('FLAVOR') =~ /dvd/i && (is_sle_micro('<6.0') || is_leap_micro('<6.0'))
);
my ($run_args) = @_;
Expand Down Expand Up @@ -181,7 +182,9 @@ sub load_host_tests_podman {
loadtest 'containers/podman_remote' if (is_sle('>=15-SP3') || is_sle_micro('5.5+') || is_tumbleweed);
}
# Buildah is not available in SLE Micro, MicroOS and staging projects
loadtest('containers/buildah', run_args => $run_args, name => $run_args->{runtime} . "_buildah") unless (is_sle('<15') || is_sle_micro || is_microos || is_leap_micro || is_staging);
loadtest('containers/buildah', run_args => $run_args, name => $run_args->{runtime} . "_buildah") unless (is_sle('<15') || is_sle_micro || is_microos || is_leap_micro || is_staging ||
(is_sle('>=16.0') && is_transactional())
);
load_volume_tests($run_args);
load_compose_tests($run_args);
loadtest('containers/seccomp', run_args => $run_args, name => $run_args->{runtime} . "_seccomp") unless is_sle('<15');
Expand Down
2 changes: 1 addition & 1 deletion tests/containers/volumes.pm
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ sub test {
sub run {
my ($self, $args) = @_;
my $runtime = $args->{runtime};
select_serial_terminal();
my $engine = $self->containers_factory($runtime);

select_serial_terminal();
test $runtime;
$engine->cleanup_system_host();

Expand Down
8 changes: 5 additions & 3 deletions tests/publiccloud/migration.pm
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,15 @@ sub run {
$instance->ssh_assert_script_run("sudo zypper refresh-services --force", timeout => 180);

# Disable maintenance updates for the migration as directory is not available during it
$instance->ssh_script_run("sudo sudo sed -i 's/^enabled=1/enabled=0/' /etc/zypp/repos.d/SUSE_Maintenance_*");
#$instance->ssh_script_run("sudo sudo sed -i 's/^enabled=1/enabled=0/' /etc/zypp/repos.d/SUSE_Maintenance_*");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we remove the commented lines?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, that should not be here 😄 Thx Maurizio

$instance->ssh_script_run("sudo sudo rm -rf /etc/zypp/repos.d/SUSE_Maintenance_*");

# Reboot to run the migration
$instance->softreboot(timeout => 3600);
validate_version($instance);

# Re-enable maintenance updates for the migration
$instance->ssh_script_run("sudo sudo sed -i 's/^enabled=0/enabled=1/' /etc/zypp/repos.d/SUSE_Maintenance_*");
#$instance->ssh_script_run("sudo sudo sed -i 's/^enabled=0/enabled=1/' /etc/zypp/repos.d/SUSE_Maintenance_*");

# Try to install aws-cli and azure-cli as they were removed for the migration
$instance->ssh_script_run("sudo zypper -n ref", timeout => 1800) if (is_ec2());
Expand All @@ -70,7 +71,8 @@ sub run {
$instance->ssh_assert_script_run("sudo zypper refresh-services --force", timeout => 180);

# Disable maintenance updates for the migration as directory is not available during it
$instance->ssh_script_run("sudo sudo sed -i 's/^enabled=1/enabled=0/' /etc/zypp/repos.d/SUSE_Maintenance_*");
#$instance->ssh_script_run("sudo sudo sed -i 's/^enabled=1/enabled=0/' /etc/zypp/repos.d/SUSE_Maintenance_*");
$instance->ssh_script_run("sudo sudo rm -rf /etc/zypp/repos.d/SUSE_Maintenance_*");

# Reboot to run the migration
$instance->softreboot(timeout => 3600);
Expand Down
Loading