Merge pull request #5409 from kalikiana/obs_rsync_gru_url

ObsRsync: Include URL in GRU task
os-autoinst · Jan 5, 2024 · bf59e01 · bf59e01
2 parents 9c8a390 + 2f1b181
commit bf59e01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/OpenQA/WebAPI/Plugin/ObsRsync/Controller/Folders.pm b/lib/OpenQA/WebAPI/Plugin/ObsRsync/Controller/Folders.pm
@@ -72,7 +72,7 @@ sub index {
             my $args = $job->{args};
             $args = $args->[0] if (ref $args eq 'ARRAY' && scalar(@$args) == 1);
 
-            next unless (ref $args eq 'HASH' && scalar(%$args) == 1 && $args->{project});
+            next unless (ref $args eq 'HASH' && $args->{project});
             my $project = $args->{project};
             next unless exists $folder_info_by_name{$project};
             $folder_info_by_name{$project}->{state} = $job->{state};

diff --git a/lib/OpenQA/WebAPI/Plugin/ObsRsync/Controller/Gru.pm b/lib/OpenQA/WebAPI/Plugin/ObsRsync/Controller/Gru.pm
@@ -63,7 +63,7 @@ sub _extend_job_info {
 
     my $args = $job->{args};
     $args = $args->[0] if (ref $args eq 'ARRAY' && scalar(@$args) == 1);
-    if (ref $args eq 'HASH' && scalar(%$args) == 1 && $args->{project}) {
+    if (ref $args eq 'HASH' && $args->{project}) {
         $args = $args->{project};
     }
     else { $args = dump($args) }    # uncoverable statement
@@ -128,7 +128,7 @@ sub run {
     return $self->render(json => {message => 'queue full'}, status => QUEUE_FULL)
       if ($results->{total} >= $queue_limit);
 
-    $app->gru->enqueue('obs_rsync_run', {project => $project}, {priority => 100});
+    $app->gru->enqueue('obs_rsync_run', {project => $project, url => $helper->project_status_url}, {priority => 100});
 
     return $self->render(json => {message => 'queued'}, status => QUEUED) if $has_active_job;    # uncoverable statement
     return $self->render(json => {message => 'started'}, status => STARTED);