Remove defaults, should be ensured by OpenQA::Setup already

Issue: https://progress.opensuse.org/issues/134114
os-autoinst · Aug 17, 2023 · acc5f55 · acc5f55
1 parent 9dd2c86
commit acc5f55
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/lib/OpenQA/Scheduler/Model/Jobs.pm b/lib/OpenQA/Scheduler/Model/Jobs.pm
@@ -43,7 +43,7 @@ sub schedule ($self, $allocated_workers = {}, $allocated_jobs = {}) {
     my $worker_count = $schema->resultset('Workers')->count;
     my $free_worker_count = @$free_workers;
     my $running = $schema->resultset('Jobs')->count({state => [OpenQA::Jobs::Constants::EXECUTION_STATES]});
-    my $limit = OpenQA::App->singleton->config->{scheduler}->{max_running_jobs} // -1;
+    my $limit = OpenQA::App->singleton->config->{scheduler}->{max_running_jobs};
     if ($limit >= 0 && $running >= $limit) {
         log_debug("max_running_jobs ($limit) exceeded, scheduling no additional jobs");
         $self->emit('conclude');
@@ -361,8 +361,7 @@ sub _to_be_scheduled ($j, $scheduled) {
 
 sub _update_scheduled_jobs ($self) {
     my $cur_time = DateTime->now(time_zone => 'UTC');
-    my $max_job_scheduled_time = $self->{config}->{scheduler}->{max_job_scheduled_time}
-      // 7;    # default value reused for testsuite
+    my $max_job_scheduled_time = OpenQA::App->singleton->config->{scheduler}->{max_job_scheduled_time};
 
     # consider all scheduled jobs not being blocked by a parent job or Gru task
     my $schema = OpenQA::Schema->singleton;

diff --git a/lib/OpenQA/WebAPI/Controller/Test.pm b/lib/OpenQA/WebAPI/Controller/Test.pm
@@ -248,7 +248,7 @@ sub list_running_ajax {
             });
     }
     my %response = (data => \@running);
-    my $max_running = OpenQA::App->singleton->config->{scheduler}->{max_running_jobs} // -1;
+    my $max_running = OpenQA::App->singleton->config->{scheduler}->{max_running_jobs};
     $response{max_running_jobs} = $max_running if $max_running >= 0 && @running >= $max_running;
     $self->render(json => \%response);
 }

diff --git a/t/05-scheduler-capabilities.t b/t/05-scheduler-capabilities.t
@@ -17,6 +17,7 @@ use Mojo::Util 'monkey_patch';
 use OpenQA::Test::TimeLimit '10';
 
 setup_mojo_app_with_default_worker_timeout;
+OpenQA::Setup::read_config(OpenQA::App->singleton);
 
 my $schema = OpenQA::Test::Database->new->create;
 my $sent = {};

diff --git a/t/05-scheduler-full.t b/t/05-scheduler-full.t
@@ -43,6 +43,7 @@ use OpenQA::Test::TimeLimit '150';
 plan skip_all => "set FULLSTACK=1 (be careful)" unless $ENV{FULLSTACK};
 
 setup_mojo_app_with_default_worker_timeout;
+OpenQA::Setup::read_config(OpenQA::App->singleton);
 
 # setup directories and database
 my $tempdir = setup_fullstack_temp_dir('scheduler');

diff --git a/t/43-scheduling-and-worker-scalability.t b/t/43-scheduling-and-worker-scalability.t
@@ -39,6 +39,7 @@ BEGIN {
 }
 
 setup_mojo_app_with_default_worker_timeout;
+OpenQA::Setup::read_config(OpenQA::App->singleton);
 
 # read number of workers to spawn from environment variable; skip test entirely if variable not present
 # similar to other fullstack tests