Merge pull request #6812 from Martchus/git-clone-distri

Avoid creation of git_clone tasks for jobs with empty DISTRI

Author: mergify[bot]

lib/OpenQA/Schema/Result/ScheduledProducts.pm

@@ -308,7 +308,7 @@ sub _create_jobs_in_database ($self, $jobs, $failed_job_info, $skip_chained_deps
     } keys %tmp_downloads;
     my $gru = OpenQA::App->singleton->gru;
     $gru->enqueue_download_jobs(\%downloads, $minion_ids);
-    $gru->enqueue_git_clones(\%clones, $successful_job_ids, $minion_ids) if keys %clones;
+    $gru->enqueue_git_clones(\%clones, $successful_job_ids, $minion_ids);
 }
 
 =over 4

lib/OpenQA/Utils.pm

@@ -537,7 +537,7 @@ sub create_downloads_list ($job_settings) {
 }
 
 sub create_git_clone_list ($job_settings, $clones = {}) {
-    my $distri = $job_settings->{DISTRI};
+    return $clones unless my $distri = $job_settings->{DISTRI};
     my $config = OpenQA::App->singleton->config->{'scm git'};
     if ($config->{git_auto_update} eq 'yes') {
         # Potential existing git clones to update without having CASEDIR or NEEDLES_DIR

lib/OpenQA/WebAPI/Controller/API/V1/Job.pm

@@ -346,7 +346,7 @@ sub _create_job ($self, $global_params, $job_suffix, $job_specific_params, $mini
     push @{$downloads->{$_}}, [$job_id] for keys %$downloads;
     $self->gru->enqueue_download_jobs($downloads, $minion_ids);
     my $clones = create_git_clone_list($job_settings);
-    $self->gru->enqueue_git_clones($clones, [$job_id], $minion_ids) if keys %$clones;
+    $self->gru->enqueue_git_clones($clones, [$job_id], $minion_ids);
     return $job_id;
 }
 

t/14-grutasks-git.t

@@ -9,6 +9,7 @@ use FindBin;
 use lib "$FindBin::Bin/lib", "$FindBin::Bin/../external/os-autoinst-common/lib";
 use OpenQA::Task::Git::Clone;
 use OpenQA::Git::ServerAvailability qw(report_server_unavailable report_server_available SKIP FAIL);
+use OpenQA::Utils qw(create_git_clone_list);
 require OpenQA::Test::Database;
 use OpenQA::Test::Utils qw(run_gru_job perform_minion_jobs);
 use OpenQA::Test::TimeLimit '20';
@@ -335,6 +336,16 @@ subtest 'git_update_all' => sub {
       if $gru_task;
 };
 
+subtest 'create_git_clone_list' => sub {
+    my (%clones, %job_settings);
+    create_git_clone_list(\%job_settings, \%clones);
+    is_deeply \%clones, {}, 'no clones added without distri' or always_explain \%clones;
+    $job_settings{DISTRI} = 'some-distri';
+    create_git_clone_list(\%job_settings, \%clones);
+    my %expected_clones = map { ("t/data/openqa/share/tests/some-distri$_" => undef) } '', '/needles';
+    is_deeply \%clones, \%expected_clones, 'clones added for distri' or always_explain \%clones;
+};
+
 subtest 'enqueue_git_clones' => sub {
     my $minion = $t->app->minion;
     my $clones = {x => 'y'};

t/api/04-jobs.t

@@ -1698,6 +1698,7 @@ subtest 'handle git_clone without CASEDIR' => sub {
     my $params = {
         TEST => 'handle_git_clone',
         MACHINE => '64bit',
+        DISTRI => 'opensuse',
     };
     $t->post_ok('/api/v1/jobs', form => $params)->status_is(200);
 
@@ -1712,15 +1713,9 @@ subtest 'handle git_clone without CASEDIR' => sub {
         is $task, 'git_clone', 'git_clone task was scheduled';
         push @gru_task_values, $gru_task->args;
     }
-    is_deeply \@gru_task_values,
-      [
-        [
-            {
-                path('t/data/openqa/share/tests')->realpath => undef,
-                path('t/data/openqa/share/tests/needles')->realpath => undef,
-            }]
-      ],
-      'the git_clone gru tasks was created correctly';
+    my %expected_values = map { path("t/data/openqa/share/tests/opensuse$_")->realpath => undef } '', '/needles';
+    is_deeply \@gru_task_values, [[\%expected_values]], 'the git_clone gru tasks was created correctly'
+      or always_explain \@gru_task_values;
 
     subtest 'enqueue git_clone for job restarts' => sub {
         $job->update({state => 'done'});