Adjustments for immutable SLE16.0 container host testing

Author: pdostal

data/agama_auto/sle_default_immutable.jsonnet

@@ -17,6 +17,13 @@
     password: '$6$vYbbuJ9WMriFxGHY$gQ7shLw9ZBsRcPgo6/8KmfDvQ/lCqxW8/WnMoLCoWGdHO6Touush1nhegYfdBbXRpsQuy/FTZZeg7gQL50IbA/',
     hashedPassword: true
   },
+  software: {
+    packages: [
+      'curl',
+      'wget',
+      'acl',
+    ]
+  },
   scripts: {
     post: [
       {

lib/main_containers.pm

@@ -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) = @_;
@@ -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');

tests/containers/volumes.pm

@@ -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();
 

tests/publiccloud/migration.pm

@@ -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_*");
+        $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());
@@ -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);