Merge pull request #156 from os-autoinst/minimalx_in_tests

Switch base TW image to minimalx desktop
os-autoinst · Dec 14, 2023 · a35cc7b · a35cc7b
2 parents 92866dc + 40fe070
commit a35cc7b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/openqa.yml b/.github/workflows/openqa.yml
@@ -36,6 +36,6 @@ jobs:
           --apikey "$OPENQA_API_KEY" --apisecret "$OPENQA_API_SECRET"
           --param-file SCENARIO_DEFINITIONS_YAML=scenario-definitions.yaml
           DISTRI=openQA VERSION=Tumbleweed FLAVOR=dev ARCH=x86_64
-          HDD_1=opensuse-Tumbleweed-x86_64-${{ steps.latest_build.outputs.build }}-gnome-wicked@64bit.qcow2
+          HDD_1=opensuse-Tumbleweed-x86_64-${{ steps.latest_build.outputs.build }}-minimalx@64bit.qcow2
           BUILD="$(tr '/' ':' <<<"$GH_REPO")#$GH_REF" _GROUP_ID="0"
           CASEDIR="$GITHUB_SERVER_URL/$GH_REPO.git#$GH_REF"
diff --git a/scenario-definitions.yaml b/scenario-definitions.yaml
@@ -23,23 +23,28 @@ job_templates:
   openqa_from_git:
     <<: *common
     settings:
+      DESKTOP: minimalx
       OPENQA_FROM_GIT: "1"
   openqa_from_containers:
     <<: *common
     settings:
-      OPENQA_FROM_GIT: "1"
-      OPENQA_CONTAINERS: "1"
+      DESKTOP: minimalx
       LOAD_PYTHON_TEST_MODULES: "0"
+      OPENQA_CONTAINERS: "1"
+      OPENQA_FROM_GIT: "1"
   openqa_from_bootstrap:
     <<: *common
     settings:
+      DESKTOP: minimalx
       OPENQA_FROM_BOOTSTRAP: "1"
   openqa_install_nginx:
     <<: *common
     settings:
+      DESKTOP: minimalx
       OPENQA_WEB_PROXY: 'nginx'
   openqa_install+publish:
     <<: *common
     settings:
+      DESKTOP: minimalx
       PUBLISH_HDD_1: 'opensuse-Tumbleweed-%ARCH%@%MACHINE%-%BUILD%.qcow2'
       PUBLISH_PFLASH_VARS: 'opensuse-Tumbleweed-%ARCH%@%MACHINE%-%BUILD%-uefi-vars.qcow2'
diff --git a/tests/osautoinst/worker.pm b/tests/osautoinst/worker.pm
@@ -13,6 +13,7 @@ sub run {
     send_key 'ret';
     wait_still_screen(2);
     assert_script_run 'systemctl status --no-pager openqa-worker@1 | grep --color -z "active (running)"';
+    script_run('dmesg -D'); # workaround for bsc#1217397
     save_screenshot;
     clear_root_console;
 }