From cc1fe56ef5314f00e6e43ee67cdb7fa78a5fb798 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Tue, 17 Sep 2024 10:24:12 +0900 Subject: [PATCH] Replace STI with TMT in CI Replace GNOME Xorg with GNOME Wayland in CI Resolves: RHEL-58993 --- .fmf/version | 1 + plans/test.fmf | 5 ++ .../install1-common/main.fmf | 68 +++++++++++++++++++ .../install2-fedora/main.fmf | 39 +++++++++++ .../install3-rhel/main.fmf | 13 ++++ .../install4-g-d-t/main.fmf | 6 ++ .../install5-tmt/main.fmf | 6 ++ .../install6-ibus-anthy/main.fmf | 6 ++ tests/ibus-desktop-testing/main.fmf | 3 + tests/ibus-desktop-testing/run/main.fmf | 5 ++ tests/ibus-desktop-testing/run/test.sh | 15 ++++ tests/main.fmt | 1 + 12 files changed, 168 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/test.fmf create mode 100644 tests/ibus-desktop-testing/install1-common/main.fmf create mode 100644 tests/ibus-desktop-testing/install2-fedora/main.fmf create mode 100644 tests/ibus-desktop-testing/install3-rhel/main.fmf create mode 100644 tests/ibus-desktop-testing/install4-g-d-t/main.fmf create mode 100644 tests/ibus-desktop-testing/install5-tmt/main.fmf create mode 100644 tests/ibus-desktop-testing/install6-ibus-anthy/main.fmf create mode 100644 tests/ibus-desktop-testing/main.fmf create mode 100644 tests/ibus-desktop-testing/run/main.fmf create mode 100755 tests/ibus-desktop-testing/run/test.sh create mode 100644 tests/main.fmt diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/test.fmf b/plans/test.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/test.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/ibus-desktop-testing/install1-common/main.fmf b/tests/ibus-desktop-testing/install1-common/main.fmf new file mode 100644 index 0000000..d4d1a62 --- /dev/null +++ b/tests/ibus-desktop-testing/install1-common/main.fmf @@ -0,0 +1,68 @@ +summary: Install common GNOME desktop components +description: + The listed packages are installed commonly between Fedora and + RHEL GNOME desktop components. +require: + # IBus CI sets + - ibus + - ibus-desktop-testing + - dbus-x11 + # https://pagure.io/fedora-comps/blob/main/f/comps-f38.xml.in + # dnf group info GNOME + # mandatory + - dconf + - gdm + - gnome-connections + - gnome-control-center + - gnome-initial-setup + - gnome-session-wayland-session + - gnome-settings-daemon + - gnome-shell + - gnome-software + - gnome-text-editor + - nautilus + - polkit + # default + - at-spi2-atk + - at-spi2-core + - avahi + - baobab + # Sometimes version mismatch with gnome-shell in rawhide + #- chrome-gnome-shell + - fprintd-pam + - glib-networking + - gnome-bluetooth + - gnome-calculator + - gnome-characters + - gnome-classic-session + - gnome-clocks + - gnome-color-manager + - gnome-disk-utility + - gnome-font-viewer + - gnome-remote-desktop + - gnome-system-monitor + - gnome-user-docs + - gvfs-goa + - gvfs-mtp + - libcanberra-gtk3 + - libproxy-duktape + - librsvg2 + - libsane-hpaio + - mesa-dri-drivers + - mesa-libEGL + - ModemManager + - NetworkManager-adsl + - NetworkManager-ppp + - NetworkManager-wwan + - orca + - PackageKit-command-not-found + - PackageKit-gtk3-module + - ptyxis + - sane-backends-drivers-scanners + # Move systemd-oomd-defaults to Post-Installing section + - tracker + - tracker-miners + - xdg-desktop-portal + - xdg-desktop-portal-gnome + - xdg-desktop-portal-gtk + - xdg-user-dirs-gtk diff --git a/tests/ibus-desktop-testing/install2-fedora/main.fmf b/tests/ibus-desktop-testing/install2-fedora/main.fmf new file mode 100644 index 0000000..9bf4560 --- /dev/null +++ b/tests/ibus-desktop-testing/install2-fedora/main.fmf @@ -0,0 +1,39 @@ +summary: Install Fedora specific GNOME desktop components +description: + The listed packages are available in Fedora only. +enabled: false +adjust: + when: distro == fedora + enabled: true +require: + - adobe-source-code-pro-fonts + - gnome-screenshot + - gnome-boxes + - yelp + - cheese + - eog + - evince + - evince-djvu + - gnome-backgrounds + - gnome-contacts + - gnome-logs + - gnome-maps + - gnome-photos + - gnome-themes-extra + - gnome-user-share + - gnome-weather + - gvfs-afc + - gvfs-afp + - gvfs-archive + - gvfs-fuse + - gvfs-gphoto2 + - gvfs-smb + - NetworkManager-openconnect-gnome + - NetworkManager-openvpn-gnome + - NetworkManager-pptp-gnome + - NetworkManager-ssh-gnome + - NetworkManager-vpnc-gnome + - rygel + - simple-scan + - sushi + - totem diff --git a/tests/ibus-desktop-testing/install3-rhel/main.fmf b/tests/ibus-desktop-testing/install3-rhel/main.fmf new file mode 100644 index 0000000..9adf494 --- /dev/null +++ b/tests/ibus-desktop-testing/install3-rhel/main.fmf @@ -0,0 +1,13 @@ +summary: Install RHEL specific GNOME desktop components +description: + gdm-headless-login-session is not available in RHEL 10 GDM yet and + the listed packages are required by the command. +enabled: false +adjust: + when: distro != fedora + enabled: true +require: + - accountsservice + - accountsservice-libs + - pam + - python3-pam diff --git a/tests/ibus-desktop-testing/install4-g-d-t/main.fmf b/tests/ibus-desktop-testing/install4-g-d-t/main.fmf new file mode 100644 index 0000000..cfd4fd7 --- /dev/null +++ b/tests/ibus-desktop-testing/install4-g-d-t/main.fmf @@ -0,0 +1,6 @@ +summary: Install GNOME installed-tests testing harness +description: + gnome-desktop-testing package is required by IBus CI(ibus-desktop-testing) + and it's available in Fedora only at present. +require: + - gnome-desktop-testing diff --git a/tests/ibus-desktop-testing/install5-tmt/main.fmf b/tests/ibus-desktop-testing/install5-tmt/main.fmf new file mode 100644 index 0000000..966cf80 --- /dev/null +++ b/tests/ibus-desktop-testing/install5-tmt/main.fmf @@ -0,0 +1,6 @@ +summary: Install TMT packages +description: + The test script is calling the beakerlib script. +require: + - beakerlib + - tmt diff --git a/tests/ibus-desktop-testing/install6-ibus-anthy/main.fmf b/tests/ibus-desktop-testing/install6-ibus-anthy/main.fmf new file mode 100644 index 0000000..0443fd1 --- /dev/null +++ b/tests/ibus-desktop-testing/install6-ibus-anthy/main.fmf @@ -0,0 +1,6 @@ +summary: Install ibus-anthy specific packages +description: + The listed packages are required by CI of ibus-anthy. +require: + - ibus-anthy-tests + - glibc-langpack-ja diff --git a/tests/ibus-desktop-testing/main.fmf b/tests/ibus-desktop-testing/main.fmf new file mode 100644 index 0000000..b4d0642 --- /dev/null +++ b/tests/ibus-desktop-testing/main.fmf @@ -0,0 +1,3 @@ +summary: gnome-desktop-testing tests +# common test for sub tests +test: env diff --git a/tests/ibus-desktop-testing/run/main.fmf b/tests/ibus-desktop-testing/run/main.fmf new file mode 100644 index 0000000..d2434b1 --- /dev/null +++ b/tests/ibus-desktop-testing/run/main.fmf @@ -0,0 +1,5 @@ +summary: Run tests +description: + Run CI with ibus-desktop-testing-runner in GNOME Wayland. +duration: 15m +test: ./test.sh diff --git a/tests/ibus-desktop-testing/run/test.sh b/tests/ibus-desktop-testing/run/test.sh new file mode 100755 index 0000000..d53faf5 --- /dev/null +++ b/tests/ibus-desktop-testing/run/test.sh @@ -0,0 +1,15 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartTest + rlRun -t "/usr/bin/ibus-desktop-testing-runner --runner gnome --tests ibus-anthy --no-graphics --lang ja_JP.UTF-8" + rlPhaseEnd + rlPhaseStartCleanup + rlRun "echo test-suite.log" + rlRun "cat test-suite.log" + rlRun "echo /export/home/itestuser/test-autostart.log" + rlRun "cat /export/home/itestuser/test-autostart.log" + rlPhaseEnd +rlJournalEnd diff --git a/tests/main.fmt b/tests/main.fmt new file mode 100644 index 0000000..e89cb45 --- /dev/null +++ b/tests/main.fmt @@ -0,0 +1 @@ +contact: Takao Fujiwara