From 2310a0e9571066b5fc4b2cfd7692de09a060ca30 Mon Sep 17 00:00:00 2001 From: Jan Baier Date: Mon, 5 Jun 2023 13:50:10 +0200 Subject: [PATCH] Add option to install openQA with bootstrap script Reference: https://progress.opensuse.org/issues/130369 --- main.pm | 2 +- tests/install/openqa_webui.pm | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/main.pm b/main.pm index bfff1b96..59fb02a2 100644 --- a/main.pm +++ b/main.pm @@ -29,7 +29,7 @@ sub load_install_tests() { # for now when testing from git only tests the webui itself, not worker # interaction return 1 if check_var('OPENQA_FROM_GIT', 1); - loadtest "install/openqa_worker.pm"; + loadtest "install/openqa_worker.pm" unless check_var('OPENQA_FROM_BOOTSTRAP', 1); loadtest "install/test_distribution.pm"; } diff --git a/tests/install/openqa_webui.pm b/tests/install/openqa_webui.pm index 61108da8..294ce833 100644 --- a/tests/install/openqa_webui.pm +++ b/tests/install/openqa_webui.pm @@ -74,7 +74,13 @@ sub run { } } else { - install_from_repos; + if (check_var('OPENQA_FROM_BOOTSTRAP', 1)) { + assert_script_run('zypper --no-cd -n in openQA-bootstrap'); + assert_script_run('skip_suse_specifics=1 skip_suse_tests=1 /usr/share/openqa/script/openqa-bootstrap', timeout => 1200); + } + else { + install_from_repos; + } } save_screenshot; clear_root_console;