From 747dbe2a6985acfdf192da8263edcf53d175bafe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Tue, 16 Mar 2021 17:46:44 +0100 Subject: [PATCH] ci: Bump to F34 This drops some custom building of various components that are now up to date. While at it, start using the FDO_DISTRIBUTION_PACKAGES variable to install packages, as it with the bumped ci-templates version also doesn't install weak dependencies. This also requires tweaking the pipewire dead lock work arounds, as it changed configuration file paths. Part-of: --- .gitlab-ci.yml | 108 ++++++++++------------------------------ .gitlab-ci/run-tests.sh | 9 ++-- 2 files changed, 31 insertions(+), 86 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19ce3c520..44c91dd84 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ include: - - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/18194044f0f984c8815bc9a1a146582f6bf15d41/templates/fedora.yml' - - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/f830873d69a7ff67a9bd69df2916dd0bb147ce09/templates/ci-fairy.yml" + - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/3d03cccd770c04e63b40325b42223495274d6a1d/templates/fedora.yml' + - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/3d03cccd770c04e63b40325b42223495274d6a1d/templates/ci-fairy.yml' stages: - review @@ -9,78 +9,22 @@ stages: - test - coverage -.mutter.fedora:33@common: +.mutter.fedora:34@common: variables: - FDO_DISTRIBUTION_VERSION: 33 - BASE_TAG: '2021-02-04.2' + FDO_DISTRIBUTION_VERSION: 34 + BASE_TAG: '2021-07-07.1' FDO_UPSTREAM_REPO: GNOME/mutter + FDO_DISTRIBUTION_PACKAGES: 'gdm gnome-shell xorg-x11-server-Xvfb sassc gcovr' + FDO_DISTRIBUTION_EXEC: | dnf install -y 'dnf-command(builddep)' && + dnf builddep -y mutter --setopt=install_weak_deps=False && - - # For running unit tests - dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 \ - 'pkgconfig(accountsservice)' \ - gnome-control-center gcovr libnma python3-gobject \ - python3-dbusmock && - - # GNOME Shell dnf builddep -y gnome-shell --setopt=install_weak_deps=False && - dnf install -y 'pkgconfig(gtk4)' 'pkgconfig(vulkan)' 'pkgconfig(libtirpc)' && - dnf remove -y gnome-bluetooth-libs-devel && - dnf remove -y --noautoremove mutter mutter-devel && - # For Xwayland/Xvfb - dnf builddep -y xorg-x11-server-Xwayland --setopt=install_weak_deps=False && - dnf remove -y --noautoremove 'xorg-x11-server-Xwayland' && - - # For glib - dnf builddep -y glib2 --setopt=install_weak_deps=False && - - ./.gitlab-ci/install-meson-project.sh \ - https://gitlab.gnome.org/GNOME/glib.git \ - 2.67.3 . && - - ./.gitlab-ci/install-meson-project.sh \ - -Dlibaudit=disabled \ - -Dplymouth=disabled \ - -Dselinux=disabled \ - -Dxdmcp=disabled \ - https://gitlab.gnome.org/GNOME/gdm.git \ - 3.38.0 . && - - ./.gitlab-ci/install-meson-project.sh \ - https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \ - 40.alpha . && - - ./.gitlab-ci/install-meson-project.sh \ - -Dxwayland=true \ - -Dxwayland_eglstream=true \ - -D{xorg,xnest,xvfb}=false \ - -Dvendor_name="Mutter CI" \ - -D{xdmcp,udev,udev_kms}=false \ - -Dxcsecurity=true \ - -Dglamor=true \ - -D{dri1,dri2}=false \ - -Ddri3=true \ - https://gitlab.freedesktop.org/xorg/xserver.git \ - master \ - . \ - a9269808f394955f213e34303c2c14fd61c35ab5 && - - ./.gitlab-ci/install-meson-project.sh \ - -Dalsa=false \ - -Dbluez5=false \ - -Dexamples=false \ - -Dgstreamer=false \ - -Djack=false \ - -Dman=false \ - -Dpipewire-alsa=false \ - -Dpipewire-jack=false \ - -Dsystemd=false \ - -Dtests=false \ - https://gitlab.freedesktop.org/pipewire/pipewire.git \ - 0.3.21 . && + rpm -e --nodeps gnome-bluetooth-libs-devel \ + mutter mutter-devel \ + gnome-shell && dnf clean all @@ -96,13 +40,13 @@ default: - 'scheduler_failure' - 'api_failure' -.mutter.fedora:33@x86_64: - extends: .mutter.fedora:33@common +.mutter.fedora:34@x86_64: + extends: .mutter.fedora:34@common variables: FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}" -.mutter.fedora:33@aarch64: - extends: .mutter.fedora:33@common +.mutter.fedora:34@aarch64: + extends: .mutter.fedora:34@common variables: FDO_DISTRIBUTION_TAG: "aarch64-${BASE_TAG}" tags: @@ -167,7 +111,7 @@ check-merge-request: build-fedora-container@x86_64: extends: - .fdo.container-build@fedora@x86_64 - - .mutter.fedora:33@x86_64 + - .mutter.fedora:34@x86_64 stage: prepare needs: - check-commit-log @@ -178,7 +122,7 @@ build-fedora-container@x86_64: build-fedora-container@aarch64: extends: - .fdo.container-build@fedora@aarch64 - - .mutter.fedora:33@aarch64 + - .mutter.fedora:34@aarch64 stage: prepare needs: - check-commit-log @@ -202,21 +146,21 @@ build-fedora-container@aarch64: build-mutter@x86_64: extends: - .build-mutter - - .mutter.fedora:33@x86_64 + - .mutter.fedora:34@x86_64 needs: - build-fedora-container@x86_64 build-mutter@aarch64: extends: - .build-mutter - - .mutter.fedora:33@aarch64 + - .mutter.fedora:34@aarch64 needs: - build-fedora-container@aarch64 build-without-opengl-and-glx@x86_64: extends: - .fdo.distribution-image@fedora - - .mutter.fedora:33@x86_64 + - .mutter.fedora:34@x86_64 stage: build needs: - build-fedora-container@x86_64 @@ -231,7 +175,7 @@ build-without-opengl-and-glx@x86_64: build-without-native-backend-and-wayland@x86_64: extends: - .fdo.distribution-image@fedora - - .mutter.fedora:33@x86_64 + - .mutter.fedora:34@x86_64 stage: build needs: - build-fedora-container@x86_64 @@ -268,14 +212,14 @@ build-without-native-backend-and-wayland@x86_64: test-mutter@x86_64: extends: - .test-mutter - - .mutter.fedora:33@x86_64 + - .mutter.fedora:34@x86_64 needs: - build-mutter@x86_64 test-mutter@aarch64: extends: - .test-mutter - - .mutter.fedora:33@aarch64 + - .mutter.fedora:34@aarch64 needs: - build-mutter@aarch64 @@ -294,21 +238,21 @@ test-mutter@aarch64: test-mutter-coverage@x86_64: extends: - .test-mutter-coverage - - .mutter.fedora:33@x86_64 + - .mutter.fedora:34@x86_64 needs: - test-mutter@x86_64 test-mutter-coverage@aarch64: extends: - .test-mutter-coverage - - .mutter.fedora:33@aarch64 + - .mutter.fedora:34@aarch64 needs: - test-mutter@aarch64 can-build-gnome-shell@x86_64: extends: - .fdo.distribution-image@fedora - - .mutter.fedora:33@x86_64 + - .mutter.fedora:34@x86_64 stage: test needs: - build-mutter@x86_64 diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh index b0a3d7dd1..f2e8519d5 100755 --- a/.gitlab-ci/run-tests.sh +++ b/.gitlab-ci/run-tests.sh @@ -5,10 +5,11 @@ set -e dconf update glib-compile-schemas $GSETTINGS_SCHEMA_DIR -# Disable audio support to not dead lock screen cast tests -rm -f /etc/pipewire/media-session.d/with-jack -rm -f /etc/pipewire/media-session.d/with-pulseaudio -pipewire & +# Disable e.g. audio support to not dead lock screen cast tests +rm -f /usr/share/pipewire/media-session.d/with-* + +PIPEWIRE_DEBUG=2 PIPEWIRE_LOG="$CI_PROJECT_DIR/build/meson-logs/pipewire.log" \ + pipewire & sleep 2