From 40ae05a38ed2ee6c686eba7fde715a04cb00e33e Mon Sep 17 00:00:00 2001 From: Marius Kittler Date: Tue, 5 Nov 2024 11:19:17 +0100 Subject: [PATCH] Revert "Enable automatic updates of test code and needles by default" This partially reverts commit a4047efc021d385dee08f370c59da2ebb1f467e0 and e932030be54505949dfefb8b838b5b57cbaa48e8 as they likely cause problems with scheduling parallel clusters using the `PARALLEL_ONE_HOST_ONLY=1` setting which is sometimes not taken into account anymore. This is presumably not caused by the automatic Git updates themselves but by the the handling of related Minion jobs: If an openQA job has pending Minion jobs then the openQA job is not considered at all by the scheduler. This presumably leads to parallel clusters being only partially considered when assigning jobs to workers breaking the `PARALLEL_ONE_HOST_ONLY=1` setting. Related ticket: https://progress.opensuse.org/issues/168379 --- docs/GettingStarted.asciidoc | 6 +++--- etc/openqa/openqa.ini | 4 ++-- lib/OpenQA/Setup.pm | 2 +- t/config.t | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/GettingStarted.asciidoc b/docs/GettingStarted.asciidoc index e0d2466d05d..33e1221ccab 100644 --- a/docs/GettingStarted.asciidoc +++ b/docs/GettingStarted.asciidoc @@ -378,9 +378,9 @@ clone a subdirectory under `/var/lib/openqa/tests` for each test distribution you need, e.g. `/var/lib/openqa/tests/opensuse` for openSUSE tests. The repositories will be kept up-to-date if `git_auto_update` is enabled in -`openqa.ini` (which is the default). The updating is triggered when new tests -are scheduled. For a periodic update (to avoid getting too far behind) you can -enable the systemd unit `openqa-enqueue-git-auto-update.timer`. +`openqa.ini`. The updating is triggered when new tests are scheduled. For a +periodic update (to avoid getting too far behind) you can enable the systemd +unit `openqa-enqueue-git-auto-update.timer`. You can get openSUSE tests and needles from https://github.com/os-autoinst/os-autoinst-distri-opensuse[GitHub]. To make it diff --git a/etc/openqa/openqa.ini b/etc/openqa/openqa.ini index 771a0eacb82..034d0f573bc 100644 --- a/etc/openqa/openqa.ini +++ b/etc/openqa/openqa.ini @@ -115,8 +115,8 @@ #do_push = no ## whether to clone CASEDIR or NEEDLES_DIR on the web UI if that var points to a Git repo #git_auto_clone = yes -## enable automatic updates of all test code and needles managed via Git -#git_auto_update = yes +## enable automatic updates of all test code and needles managed via Git (still experimental, currently still breaks scheduling parallel clusters) +#git_auto_update = no ## Authentication method to use for user management [auth] diff --git a/lib/OpenQA/Setup.pm b/lib/OpenQA/Setup.pm index 62d89a3b452..03d5eab8617 100644 --- a/lib/OpenQA/Setup.pm +++ b/lib/OpenQA/Setup.pm @@ -68,7 +68,7 @@ sub read_config ($app) { do_push => 'no', do_cleanup => 'no', git_auto_clone => 'yes', - git_auto_update => 'yes', + git_auto_update => 'no', }, scheduler => { max_job_scheduled_time => 7, diff --git a/t/config.t b/t/config.t index 2e85ff08017..43eb4cb3422 100644 --- a/t/config.t +++ b/t/config.t @@ -66,7 +66,7 @@ subtest 'Test configuration default modes' => sub { do_push => 'no', do_cleanup => 'no', git_auto_clone => 'yes', - git_auto_update => 'yes', + git_auto_update => 'no', }, 'scheduler' => { max_job_scheduled_time => 7,