Refactor it

Author: ricardobranco777

lib/main_containers.pm

@@ -143,10 +143,23 @@ sub load_firewall_test {
     loadtest('containers/firewall', run_args => $run_args, name => $run_args->{runtime} . "_firewall");
 }
 
+sub load_python_tests {
+    my $runtime = shift;
+    foreach my $target (qw(setup unit integration)) {
+        my $run_args = OpenQA::Test::RunArgs->new();
+        $run_args->{runtime} = $runtime;
+        $run_args->{target} = $target;
+        loadtest('containers/runtime_py', run_args => $run_args, name => "${runtime}_py_$target");
+    }
+}
+
 sub load_host_tests_podman {
     my ($run_args) = @_;
     # python3-podman is not available in SLE 16.0 due to https://bugzilla.suse.com/show_bug.cgi?id=1248415
-    loadtest('containers/runtime_py', run_args => $run_args, name => $run_args->{runtime} . "_py") unless (is_staging || is_transactional || is_sle(">=16.0"));
+    unless (is_staging || is_transactional || is_sle(">=16.0")) {
+        load_python_tests $run_args{runtime};
+    }
+    # FIXME
     return;
     load_container_engine_test($run_args);
     # In Public Cloud we don't have internal resources
@@ -191,7 +204,10 @@ sub load_host_tests_podman {
 
 sub load_host_tests_docker {
     my ($run_args) = @_;
-    loadtest('containers/runtime_py', run_args => $run_args, name => $run_args->{runtime} . "_py") unless (is_staging || is_transactional);
+    unless (is_staging || is_transactional) {
+        load_python_tests $run_args{runtime};
+    }
+    # FIXME
     return;
     load_container_engine_test($run_args);
     # In Public Cloud we don't have internal resources
@@ -220,7 +236,6 @@ sub load_host_tests_docker {
         # select_user_serial_terminal is broken on public cloud
         loadtest 'containers/rootless_docker' unless (is_public_cloud);
     }
-    loadtest('containers/runtime_py', run_args => $run_args, name => $run_args->{runtime} . "_py") unless (is_staging || is_transactional);
     # Expected to work anywhere except of real HW backends, PC and Micro
     unless (is_generalhw || is_ipmi || is_public_cloud || is_openstack || is_sle_micro || is_microos || is_leap_micro || (is_sle('=12-SP5') && is_aarch64)) {
         loadtest 'containers/validate_btrfs';

tests/containers/runtime_py.pm

@@ -17,44 +17,16 @@ use containers::common qw(install_packages);
 my $pytest_args = "-vv --capture=tee-sys -o junit_logging=all --junit-xml";
 my $runtime;
 my $socat = 0;
+my $target;
 my $timeout = 3600;
 
-sub docker_tests {
-    my @targets = (
-        "unit",
-        "integration"
-    );
-
-    foreach my $target (@targets) {
-        record_info "TEST", "$target";
-        script_run "pytest $pytest_args $target.xml tests/$target |& tee $target.txt", timeout => $timeout;
-        parse_extra_log('XUnit', "$target.xml");
-        upload_logs("$target.txt");
-    }
-}
-
-sub podman_tests {
-    my @targets = (
-        "unit",
-        "integration"
-    );
-
-    foreach my $target (@targets) {
-        record_info "TEST", "$target";
-        script_run "pytest $pytest_args $target.xml podman/tests/$target |& tee $target.txt", timeout => $timeout;
-        parse_extra_log('XUnit', "$target.xml");
-        upload_logs("$target.txt");
-    }
-}
-
-
-sub run {
-    my ($self, $args) = @_;
-    $runtime = $args->{runtime};
+sub setup {
+    my $runtime = shift;
 
-    my @pkgs = ($runtime, "python3-$runtime");
-    push @pkgs, qw(git-core jq python3-pytest);
-    push @pkgs, ($runtime eq "podman") ? qw(python3-fixtures python3-requests-mock) : qw(password-store python3-paramiko socat);
+    my $python3 = "python3";
+    my @pkgs = ($runtime, "$python3-$runtime");
+    push @pkgs, qq(git-core jq $python3-pytest);
+    push @pkgs, ($runtime eq "podman") ? qq($python3-fixtures $python3-requests-mock) : qq(password-store $python3-paramiko socat);
     install_packages(@pkgs);
 
     select_serial_terminal;
@@ -87,7 +59,6 @@ sub run {
         assert_script_run "chmod +x /usr/local/bin/docker-credential-pass";
     }
 
-    my $python3 = "python3";
     my $version = script_output "$python3 -c 'import $runtime; print($runtime.__version__)'";
     record_info("Version", $version);
     my $branch = ($runtime eq "podman") ? "v$version" : $version;
@@ -107,21 +78,40 @@ sub run {
     assert_script_run "git clone --depth 1 --branch $branch https://github.com/$github_org/$runtime-py";
     assert_script_run "cd $runtime-py";
 
-    if ($runtime eq "podman") {
-        podman_tests;
-    } else {
+    if ($runtime eq "docker") {
         # Fill credentials store
         assert_script_run "gpg2 --import ./tests/gpg-keys/secret";
         assert_script_run "gpg2 --import-ownertrust ./tests/gpg-keys/ownertrust";
         assert_script_run "yes | pass init \$(gpg2 --no-auto-check-trustdb --list-secret-key | awk '/^sec/{getline; \$1=\$1; print}')";
         assert_script_run "gpg2 --check-trustdb";
-        docker_tests;
     }
 }
 
-1;
+sub test {
+    my $target = shift;
+
+    # Tests directory
+    my $tests = ($runtime eq "podman") ? "podman/tests" : "tests";
+
+    script_run "pytest $pytest_args $target.xml $tests/$target |& tee $target.txt", timeout => $timeout;
+    parse_extra_log('XUnit', "$target.xml");
+    upload_logs("$target.txt");
+}
+
+sub run {
+    my ($self, $args) = @_;
+    $runtime = $args->{runtime};
+    $target = $args->{target};
+    if ($target eq "setup") {
+        setup;
+    } else {
+        test $args->{target};
+    }
+}
 
 sub cleanup() {
+    # FIXME: We need this
+    return;
     script_run "kill -9 $socat";
     script_run "cd / ; rm -rf /root/$runtime-py";
 }
@@ -137,3 +127,5 @@ sub post_run_hook {
     cleanup;
     $self->SUPER::post_run_hook;
 }
+
+1;