Merge pull request #6692 from d3flex/check-git-status

Check git status

Author: mergify[bot]

.gitignore

@@ -1,6 +1,11 @@
 logs/*.tar.*
 etc/mine/
-cover_db/
+# Devel::Cover
+/cover_db*
+# TAP::Harness::JUnit
+/test-results/
+# CircleCI cache
+/logs/
 temp
 /testresults
 /t/data/openqa/webui/cache

Makefile

@@ -269,7 +269,7 @@ test-with-database: node_modules setup-database
 test-unit-and-integration: node_modules
 	export GLOBIGNORE="$(GLOBIGNORE)";\
 	export DEVEL_COVER_DB_FORMAT=JSON;\
-	export PERL5OPT="$(COVEROPT)$(PERL5OPT) -It/lib -I$(PWD)/t/lib -I$(PWD)/external/os-autoinst-common/lib -MOpenQA::Test::PatchDeparse";\
+	export PERL5OPT="$(COVEROPT)$(PERL5OPT) -It/lib -I$(PWD)/t/lib -I$(PWD)/external/os-autoinst-common/lib $(CHECK_GIT_STATUS_OPT) -MOpenQA::Test::PatchDeparse";\
 	RETRY=${RETRY} HOOK=./tools/delete-coverdb-folder timeout -s SIGINT -k 5 -v ${TIMEOUT_RETRIES} tools/retry "${PROVE}" ${PROVE_LIB_ARGS} ${PROVE_ARGS}
 
 .PHONY: setup-database
@@ -299,6 +299,10 @@ COVERDB_SUFFIX ?=
 COVEROPT ?= -mJSON::PP -It/lib -MCoverageWorkaround -MDevel::Cover=-select_re,'^/lib',+ignore_re,lib/perlcritic/Perl/Critic/Policy|t/lib/CoverageWorkaround,-coverage,statement,-db,cover_db$(COVERDB_SUFFIX),
 endif
 
+ifeq ($(CHECK_GIT_STATUS),1)
+CHECK_GIT_STATUS_OPT ?= -MTest::CheckGitStatus
+endif
+
 .PHONY: coverage
 coverage:
 	export DEVEL_COVER_DB_FORMAT=JSON;\

cpanfile

@@ -119,6 +119,7 @@ on 'develop' => sub {
     requires 'Perl::Critic';
     requires 'Perl::Critic::Community';
     requires 'Perl::Tidy', '== 20250711.0.0';
+    requires 'Test::CheckGitStatus';
 
 };
 

dependencies.yaml

@@ -85,6 +85,7 @@ devel_no_selenium_requires:
   tar:
   xorg-x11-fonts:
   perl(Perl::Tidy): '== 20250711.0.0'
+  perl(Test::CheckGitStatus):
 
 devel_requires:
   '%devel_no_selenium_requires':

dist/rpm/openQA.spec

@@ -94,7 +94,7 @@
 # The following line is generated from dependencies.yaml
 %define cover_requires perl(Devel::Cover) perl(Devel::Cover::Report::Codecovbash)
 # The following line is generated from dependencies.yaml
-%define devel_no_selenium_requires %build_requires %cover_requires %qemu %style_check_requires %test_requires curl perl(Perl::Tidy) postgresql-devel rsync sudo tar xorg-x11-fonts
+%define devel_no_selenium_requires %build_requires %cover_requires %qemu %style_check_requires %test_requires curl perl(Perl::Tidy) perl(Test::CheckGitStatus) postgresql-devel rsync sudo tar xorg-x11-fonts
 # The following line is generated from dependencies.yaml
 %define devel_requires %devel_no_selenium_requires chromedriver
 

t/32-openqa_client.t

@@ -8,11 +8,12 @@ use Test::Warnings ':report_warnings';
 use FindBin;
 use lib "$FindBin::Bin/lib", "$FindBin::Bin/../external/os-autoinst-common/lib";
 use Test::Mojo;
-use Mojo::File qw(tempfile path);
+use Mojo::File qw(tempfile path tempdir);
 use OpenQA::Events;
 use OpenQA::Test::Case;
 use OpenQA::Test::Client 'client';
 use OpenQA::Test::TimeLimit '80';
+use Mojo::Util qw(scope_guard);
 
 plan skip_all => 'set HEAVY=1 to execute (takes longer)' unless $ENV{HEAVY};
 
@@ -22,6 +23,10 @@ my $chunk_size = 10000000;
 # allow up to 200MB - videos mostly
 $ENV{MOJO_MAX_MESSAGE_SIZE} = 207741824;
 
+my $tempdir = tempdir("$FindBin::Script-XXXX", TMPDIR => 1);
+chdir $tempdir;
+my $guard = scope_guard sub { chdir $FindBin::Bin };
+
 my @client_args = (apikey => 'PERCIVALKEY02', apisecret => 'PERCIVALSECRET02');
 my $t = client(Test::Mojo->new('OpenQA::WebAPI'), @client_args);
 my $client = $t->ua;

t/37-limit_assets.t

@@ -6,7 +6,7 @@ use Test::Most;
 
 use FindBin;
 use lib "$FindBin::Bin/lib", "$FindBin::Bin/../external/os-autoinst-common/lib";
-use Mojo::File 'path';
+use Mojo::File qw(path tempdir);
 use Test::Mojo;
 use Test::Warnings ':report_warnings';
 use Test::MockModule;
@@ -41,6 +41,8 @@ my $assets = $schema->resultset('Assets');
 # assume some assets already have a last_use_job_id
 $assets->find($_)->update({last_use_job_id => 99963}) for (2, 3);
 
+my $tempdir = tempdir("$FindBin::Script-XXXX", TMPDIR => 1);
+
 note('Asset directory: ' . assetdir());
 
 subtest 'configurable concurrency' => sub {
@@ -55,6 +57,7 @@ subtest 'configurable concurrency' => sub {
 };
 
 subtest 'filesystem removal' => sub {
+    local $ENV{OPENQA_SHAREDIR} = "$tempdir/openqa";
     my $asset_sub_dir = path(assetdir(), 'foo');
     $asset_sub_dir->remove_tree->make_path;
 

t/43-scheduling-and-worker-scalability.t

@@ -12,7 +12,7 @@ use File::Path 'make_path';
 use Scalar::Util 'looks_like_number';
 use List::Util qw(min max);
 use Mojo::File qw(path tempfile);
-use Mojo::Util 'dumper';
+use Mojo::Util qw(dumper scope_guard);
 use IPC::Run qw(start);
 use FindBin;
 use lib "$FindBin::Bin/lib", "$FindBin::Bin/../external/os-autoinst-common/lib";
@@ -56,6 +56,8 @@ note('Set SCALABILITY_TEST_WORKER_COUNT/SCALABILITY_TEST_JOB_COUNT to adjust thi
 
 # setup basedir, config dir and database
 my $tempdir = setup_fullstack_temp_dir('scalability');
+chdir $tempdir;
+my $guard = scope_guard sub { chdir $FindBin::Bin };
 my $schema = OpenQA::Test::Database->new->create;
 my $workers = $schema->resultset('Workers');
 my $jobs = $schema->resultset('Jobs');

t/api/04-jobs.t

@@ -9,6 +9,7 @@ use FindBin;
 use lib "$FindBin::Bin/../lib", "$FindBin::Bin/../../external/os-autoinst-common/lib";
 use Mojo::Base -signatures;
 use File::Temp;
+use File::Copy::Recursive qw(dircopy);
 use Test::Mojo;
 use Test::Output;
 use Test::Warnings ':report_warnings';
@@ -39,7 +40,7 @@ $ENV{OPENQA_BASEDIR} = $tempdir;
 note("OPENQA_BASEDIR: $tempdir");
 path($tempdir, '/openqa/testresults')->make_path;
 my $share_dir = path($tempdir, 'openqa/share')->make_path;
-symlink "$FindBin::Bin/../data/openqa/share/factory", "$share_dir/factory";
+dircopy("$FindBin::Bin/../data/openqa/share/factory", "$share_dir/factory");
 
 # ensure job events are logged
 $ENV{OPENQA_CONFIG} = $tempdir;

tools/ci/ci-packages.txt

@@ -222,6 +222,7 @@ perl-SUPER-1.20141117
 perl-Syntax-Keyword-Try-0.28
 perl-TAP-Harness-JUnit-0.42
 perl-Task-Weaken-1.06
+perl-Test-CheckGitStatus
 perl-Test-Deep-1.127
 perl-Test-Differences-0.64
 perl-Test-Exception-0.430000