[nautilus/alatiera/poking-ci] fixup! CI: Factorout flatpak job into a template

[Jordan Petridis <jpetridis src gnome org>]

commit 456c05c12789e1a3903c65817dfd8ad3ef822a42
Author: Jordan Petridis <jpetridis gnome org>
Date:   Tue Oct 9 15:05:48 2018 +0300

    fixup! CI: Factorout flatpak job into a template

 .gitlab-ci.yml | 65 ++++++++++++++++++++++------------------------------------
 1 file changed, 24 insertions(+), 41 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ac598447..de5eb974c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,15 @@ stages:
         - flatpak build app ninja -C _build install
         - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
         # Run automatic tests inside the Flatpak env
-        - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app ninja -C _build test
+        # Setting LANG to avoid Tracker complaining and falling back to the same value,
+        # and setting NO_AT_BRIDGE, so that atk-bridge isn’t initialized, preventing
+        # annoying warnings that don’t affect the kinds of tests that we run.
+        - xvfb-run -a -s "-screen 0 1024x768x24" \
+            flatpak build \
+              --env=LANG=C.UTF-8 \
+              --env=NO_AT_BRIDGE=1 \
+              app \
+              dbus-run-session meson test -C _build
         # Generate a Flatpak bundle
         - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID}
     artifacts:
@@ -76,7 +84,7 @@ stop_review:
         - master@GNOME/nautilus
         - tags
 
-fedora rawhide:
+fedora:rawhide:
     image: fedora:rawhide
     stage: cross_environment
     before_script:
@@ -107,59 +115,34 @@ fedora rawhide:
         - web
         - tags
 
-ubuntu devel:
+ubuntu:devel:
     image: ubuntu:devel
     stage: cross_environment
-    variables:
-        DEPENDANCIES: |
-            git \
-            gcc \
-            meson \
-            gettext \
-            itstool \
-            gobject-introspection \
-            desktop-file-utils \
-            libxml2-dev \
-            libgtk-3-dev \
-            libgexiv2-dev \
-            libseccomp-dev \
-            libgnome-autoar-0-dev \
-            libgirepository1.0-dev \
-            libtracker-sparql-2.0-dev \
-            libtracker-control-2.0-dev \
-            gsettings-desktop-schemas-dev \
     before_script:
         # Ubuntu requires running update to fetch metadata and find packges
         - apt-get update
-        - apt-get install -y $DEPENDANCIES
+        - apt-get install -y gcc meson gettext itstool git libgtk-3-dev
+                             libgnome-autoar-0-dev
+                             gobject-introspection libxml2-dev
+                             libtracker-control-2.0-dev desktop-file-utils libgexiv2-dev
+                             libtracker-sparql-2.0-dev
+                             libgirepository1.0-dev gsettings-desktop-schemas-dev
+                             libseccomp-dev
     <<: *distro_test
     only:
         - schedules
         - web
         - tags
 
-opensuse tumbleweed:
+opensuse:tumbleweed:
     image: opensuse:tumbleweed
     stage: cross_environment
-    variables:
-        DEPENDANCIES: |
-            git \
-            gcc \
-            meson \
-            itstool \
-            gtk3-devel \
-            gettext-tools \
-            libxml2-devel \
-            tracker-devel \
-            libgexiv2-devel \
-            gettext-runtime \
-            gnome-autoar-devel \
-            desktop-file-utils \
-            gobject-introspection-devel \
-            gsettings-desktop-schemas-devel \
-            libseccomp-devel
     before_script:
-        - zypper install -y $DEPENDANCIES
+        - zypper install -y gcc meson gettext-runtime gettext-tools itstool git
+                            gtk3-devel gnome-autoar-devel
+                            gobject-introspection-devel libxml2-devel tracker-devel
+                            desktop-file-utils libgexiv2-devel gsettings-desktop-schemas-devel
+                            libseccomp-devel
     <<: *distro_test
     only:
         - schedules