From abe343b535af5f576d0e5f8bcf2d96031a66bfc9 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Wed, 20 Apr 2022 09:35:28 +0200 Subject: [PATCH 1/2] Remove obsolete SLE12 support --- tests/install/openqa_webui.pm | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/tests/install/openqa_webui.pm b/tests/install/openqa_webui.pm index 1f59e640..1decf1ef 100644 --- a/tests/install/openqa_webui.pm +++ b/tests/install/openqa_webui.pm @@ -7,24 +7,14 @@ use utils; sub install_from_repos { diag('following https://github.com/os-autoinst/openQA/blob/master/docs/Installing.asciidoc'); my $add_repo; - if (get_required_var('VERSION') =~ /(tw|Tumbleweed)/) { - my %repo_suffix = ( - x86_64 => 'Tumbleweed', - aarch64 => 'Factory_ARM', - ppc64le => 'Factory_PowerPC' - ); - my $repo = 'openSUSE_' . $repo_suffix{get_required_var('ARCH')}; - $add_repo = "zypper --non-interactive ar -f obs://devel:openQA/$repo openQA"; - } - elsif (check_var('VERSION', 'SLES-12SP5')) { - $add_repo = <<'EOF'; -zypper ar -f http://download.opensuse.org/repositories/devel:/openQA/SLE_12_SP5/devel:openQA.repo -zypper ar -f http://download.opensuse.org/repositories/devel:/openQA:/SLE-12/SLE_12_SP5/devel:openQA:SLE-12.repo -EOF - } - else { - die "Needs implementation for other versions"; - } + die 'Needs implementation for other versions' unless get_required_var('VERSION') =~ /(tw|Tumbleweed)/; + my %repo_suffix = ( + x86_64 => 'Tumbleweed', + aarch64 => 'Factory_ARM', + ppc64le => 'Factory_PowerPC' + ); + my $repo = 'openSUSE_' . $repo_suffix{get_required_var('ARCH')}; + $add_repo = "zypper --non-interactive ar -f obs://devel:openQA/$repo openQA"; assert_script_run($_) foreach (split /\n/, $add_repo); assert_script_run('zypper --no-cd --non-interactive --gpg-auto-import-keys in openQA', 600); my $configure = <<'EOF'; From 76c4c785538bf7e7d17f912b92316ecd5a259c4c Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Wed, 20 Apr 2022 09:37:51 +0200 Subject: [PATCH 2/2] Fix missing postgres server dependency As we depend on the postgreSQL server we either need to explicitly install those packages are select openQA-local-db directly which was not pulled in anymore. Related progress issue: https://progress.opensuse.org/issues/110089 --- tests/install/openqa_webui.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/install/openqa_webui.pm b/tests/install/openqa_webui.pm index 1decf1ef..bf4c40c4 100644 --- a/tests/install/openqa_webui.pm +++ b/tests/install/openqa_webui.pm @@ -16,7 +16,7 @@ sub install_from_repos { my $repo = 'openSUSE_' . $repo_suffix{get_required_var('ARCH')}; $add_repo = "zypper --non-interactive ar -f obs://devel:openQA/$repo openQA"; assert_script_run($_) foreach (split /\n/, $add_repo); - assert_script_run('zypper --no-cd --non-interactive --gpg-auto-import-keys in openQA', 600); + assert_script_run('zypper --no-cd --non-interactive --gpg-auto-import-keys in openQA-local-db', 600); my $configure = <<'EOF'; /usr/share/openqa/script/configure-web-proxy sed -i -e 's/#.*method.*OpenID.*$/&\nmethod = Fake/' /etc/openqa/openqa.ini