Add base_url attribute

Author: perlpunk

lib/OpenQA/Schema/Result/ScheduledProducts.pm

@@ -939,9 +939,8 @@ sub report_status_to_git ($self, $callback = undef) {
     $vcs->read_settings($settings) or return undef;
     my ($state, $verb, $count, $total) = $self->state_for_ci_status;
     return undef unless $state;
-    my $base_url = $settings->{CI_TARGET_URL};
     my %params = (state => $state, description => _format_check_description($verb, $count, $total));
-    $vcs->report_status_to_git(\%params, $id, $base_url, $callback);
+    $vcs->report_status_to_git(\%params, $id, $callback);
 }
 
 sub cancel ($self, $reason = undef) {

lib/OpenQA/VcsProvider.pm

@@ -8,17 +8,20 @@ use Mojo::JSON qw(encode_json);
 use Mojo::URL;
 
 has 'app';
+has 'base_url';
 has 'statuses_url';
 
 sub read_settings ($self, $settings) {
     $self->statuses_url($settings->{GITHUB_STATUSES_URL});
+    $self->base_url($settings->{CI_TARGET_URL});
     return undef unless $self->statuses_url;
     return 1;
 }
 
-sub report_status_to_git ($self, $params, $scheduled_product_id, $base_url, $callback = undef) {
+sub report_status_to_git ($self, $params, $scheduled_product_id, $callback = undef) {
     $params->{context} //= 'openqa';
     $params->{description} //= 'openQA test run';
+    my $base_url = $self->base_url;
     $params->{target_url} //= "$base_url/admin/productlog?id=$scheduled_product_id"
       if $scheduled_product_id && $base_url;
 

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

@@ -154,8 +154,8 @@ sub product ($self) {
     };
     $scheduled_product->discard_changes;    # load value of columns that have a default value
     $vcs->statuses_url($statuses_url);
-#    $vcs->read_settings($settings) or return undef;
-    my $tx = $vcs->report_status_to_git({state => 'pending'}, $scheduled_product->id, $base_url, $cb);
+    $vcs->base_url($base_url);
+    my $tx = $vcs->report_status_to_git({state => 'pending'}, $scheduled_product->id, $cb);
 }
 
 1;

t/16-utils-vcs-provider.t

@@ -22,8 +22,8 @@ subtest 'reporting status to GitHub' => sub {
 
     my $git = OpenQA::VcsProvider->new(app => $app);
     my $url = 'http://127.0.0.1/repos/some/repo/statuses/some-sha';
-    $git->read_settings({GITHUB_STATUSES_URL => $url});
-    my $tx = $git->report_status_to_git({state => 'pending'}, '42', 'https://openqa.opensuse.org');
+    $git->read_settings({GITHUB_STATUSES_URL => $url, CI_TARGET_URL => 'https://openqa.opensuse.org'});
+    my $tx = $git->report_status_to_git({state => 'pending'}, '42');
     my $req = $tx->req;
     is $req->method, 'POST', 'method';
     is $req->url, $url, 'URL';

t/api/16-webhooks.t

@@ -101,7 +101,7 @@ my $expected_ci_check_state = 'pending';
 my $expected_ci_check_desc = undef;
 $vcs_mock->redefine(
     report_status_to_git =>
-      sub ($self, $params, $scheduled_product_id, $base_url_from_req, $callback) {
+      sub ($self, $params, $scheduled_product_id, $callback) {
         my $tx = $ua->build_tx(POST => 'http://dummy');
         is $self->statuses_url, $expected_statuses_url, 'URL from webhook payload used for reporting back';
         is $params->{state}, $expected_ci_check_state, "check reported to be $expected_ci_check_state";