From bf189779e91d06fbe023b86e30f4e3109998b85b Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Thu, 1 Aug 2024 08:39:32 +0900 Subject: [PATCH] Update CI for Fedora 41 and RHEL - Replace gnome-terminal with ptyxis - Install gnome-desktop-testing for RHEL - Delete xorg-x11-server-Xvfb gnome-session-xsession - Delete build packages for gnome-desktop-testing for RHEL - Move evince gnome-logs gvfs-fuse gvfs-gphoto2 gvfs-smb to Fedora specific - Fix CI test case conditions --- ibus-HEAD.patch | 12 ++++++------ .../ibus-desktop-testing/install1-common/main.fmf | 10 +--------- .../ibus-desktop-testing/install2-fedora/main.fmf | 7 +++++++ .../install3-no-g-d-t/main.fmf | 14 -------------- tests/ibus-desktop-testing/install3-rhel/main.fmf | 13 +++++++++++++ tests/ibus-desktop-testing/install4-g-d-t/main.fmf | 2 -- 6 files changed, 27 insertions(+), 31 deletions(-) delete mode 100644 tests/ibus-desktop-testing/install3-no-g-d-t/main.fmf create mode 100644 tests/ibus-desktop-testing/install3-rhel/main.fmf diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch index bafefcd..282b75f 100644 --- a/ibus-HEAD.patch +++ b/ibus-HEAD.patch @@ -3674,11 +3674,10 @@ index e9f102a1..0679c259 100644 -- 2.45.0 -From b485ef777352f2e4f0b1ef458826a0aff0c8d136 Mon Sep 17 00:00:00 2001 +From 23785e6c8150aceda7f9665a3335f1e4baecd1cc Mon Sep 17 00:00:00 2001 From: fujiwarat -Date: Sat, 27 Jul 2024 19:19:43 +0900 -Subject: [PATCH 6/6] src/tests: Fix some CI issues with busy TMT virtual - session +Date: Thu, 1 Aug 2024 08:23:09 +0900 +Subject: [PATCH 6/6] src/tests: Fix some CI issues with busy TMT virtual session - Increase waiting time in ibus-compose-locales. - Wait for 3 secs after set-engine in ibus-compose to wait for the delayed @@ -3689,6 +3688,7 @@ Subject: [PATCH 6/6] src/tests: Fix some CI issues with busy TMT virtual - Quote file names as shell syntax as much as possible. - Check file existent and do not use "rm -f" as much as possible. - Do not set GTK_IM_MODULE=ibus for Wayland. +- Exclude sshd-session to check existent sessions. BUG=https://github.com/ibus/ibus/pull/2657 --- @@ -3762,7 +3762,7 @@ index d50354df..9ecc8c27 100755 run_test_suite finit diff --git a/src/tests/ibus-desktop-testing-module b/src/tests/ibus-desktop-testing-module -index 2d686813..e576df87 100755 +index 2d686813..55eb248e 100755 --- a/src/tests/ibus-desktop-testing-module +++ b/src/tests/ibus-desktop-testing-module @@ -63,8 +63,9 @@ pwd @@ -3791,7 +3791,7 @@ index 2d686813..e576df87 100755 fi fi - SESSION=`ps -ef | grep session | grep -v grep` -+ SESSION=`ps -ef | grep session | grep -v TMT | grep -v grep` ++ SESSION=`ps -ef | grep session | grep -v TMT | grep -v sshd-session | grep -v grep` if [ x"$SESSION" != x ] ; then print_log -e "${RED}FAIL${NC}: ${RED}ERROR${NC}: Session is running: $SESSION" exit 1 diff --git a/tests/ibus-desktop-testing/install1-common/main.fmf b/tests/ibus-desktop-testing/install1-common/main.fmf index 113b3b9..d4d1a62 100644 --- a/tests/ibus-desktop-testing/install1-common/main.fmf +++ b/tests/ibus-desktop-testing/install1-common/main.fmf @@ -4,7 +4,6 @@ description: RHEL GNOME desktop components. require: # IBus CI sets - - xorg-x11-server-Xvfb - ibus - ibus-desktop-testing - dbus-x11 @@ -17,11 +16,9 @@ require: - gnome-control-center - gnome-initial-setup - gnome-session-wayland-session - - gnome-session-xsession - gnome-settings-daemon - gnome-shell - gnome-software - - gnome-terminal - gnome-text-editor - nautilus - polkit @@ -32,7 +29,6 @@ require: - baobab # Sometimes version mismatch with gnome-shell in rawhide #- chrome-gnome-shell - - evince - fprintd-pam - glib-networking - gnome-bluetooth @@ -43,16 +39,11 @@ require: - gnome-color-manager - gnome-disk-utility - gnome-font-viewer - - gnome-logs - gnome-remote-desktop - gnome-system-monitor - - gnome-terminal-nautilus - gnome-user-docs - - gvfs-fuse - gvfs-goa - - gvfs-gphoto2 - gvfs-mtp - - gvfs-smb - libcanberra-gtk3 - libproxy-duktape - librsvg2 @@ -66,6 +57,7 @@ require: - orca - PackageKit-command-not-found - PackageKit-gtk3-module + - ptyxis - sane-backends-drivers-scanners # Move systemd-oomd-defaults to Post-Installing section - tracker diff --git a/tests/ibus-desktop-testing/install2-fedora/main.fmf b/tests/ibus-desktop-testing/install2-fedora/main.fmf index 0484cca..9bf4560 100644 --- a/tests/ibus-desktop-testing/install2-fedora/main.fmf +++ b/tests/ibus-desktop-testing/install2-fedora/main.fmf @@ -1,8 +1,10 @@ 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 @@ -10,9 +12,11 @@ require: - yelp - cheese - eog + - evince - evince-djvu - gnome-backgrounds - gnome-contacts + - gnome-logs - gnome-maps - gnome-photos - gnome-themes-extra @@ -21,6 +25,9 @@ require: - gvfs-afc - gvfs-afp - gvfs-archive + - gvfs-fuse + - gvfs-gphoto2 + - gvfs-smb - NetworkManager-openconnect-gnome - NetworkManager-openvpn-gnome - NetworkManager-pptp-gnome diff --git a/tests/ibus-desktop-testing/install3-no-g-d-t/main.fmf b/tests/ibus-desktop-testing/install3-no-g-d-t/main.fmf deleted file mode 100644 index f573331..0000000 --- a/tests/ibus-desktop-testing/install3-no-g-d-t/main.fmf +++ /dev/null @@ -1,14 +0,0 @@ -summary: Install build environment -description: - gnome-desktop-testing package is not available in RHEL 10 yet and - the listed packages are installed for the build environment of - gnome-desktop-testing. -adjust: - when: distro != fedora -require: - - autoconf - - automake - - make - - gcc - - git - - libtool 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 index dd6ce6d..cfd4fd7 100644 --- a/tests/ibus-desktop-testing/install4-g-d-t/main.fmf +++ b/tests/ibus-desktop-testing/install4-g-d-t/main.fmf @@ -2,7 +2,5 @@ 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. -adjust: - when: distro == fedora require: - gnome-desktop-testing