[gnome-notes/wip/igaldino/ci-fix] gitlab-ci: Adhere to GitLab changes

[Isaque Galdino de Araujo <igaldino src gnome org>]

commit 07d64b1dc47ebdabe5df44d3348c81b1079eda55
Author: Isaque Galdino <igaldino gmail com>
Date:   Wed Feb 19 19:50:57 2020 -0300

    gitlab-ci: Adhere to GitLab changes

 .gitlab-ci.yml | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce2e2a6..9a784e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,24 +1,18 @@
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+
 stages:
 - test
 
+variables:
+    BUNDLE: "gnome-notes.flatpak"
+
 flatpak:
     image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
-    stage: test
-
     variables:
-        # Replace with your manifest path
         MANIFEST_PATH: "build-aux/flatpak/org.gnome.Notes.json"
-        RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
-        # Replace with your application name, as written in the manifest
+        MESON_ARGS: "-Dflatpak=true -Dprofile=development"
         FLATPAK_MODULE: "bijiben"
-        # Make sure to keep this in sync with the Flatpak manifest, all arguments
-        # are passed except the config-args because we build it ourselves
-        # CONFIGURE_ARGS: "-Dtests=all"
+        RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
+        APP_ID: "org.gnome.Notes"
+    extends: .flatpak
 
-    script:
-        - git submodule update --init --recursive
-        - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
-        - flatpak build app meson --prefix=/app ${CONFIGURE_ARGS} _build
-        - flatpak build app ninja -C _build install
-        # Run tests inside the Flatpak env emulating a display
-        - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app ninja -C _build test