[librsvg/librsvg-2.44] Update .gitlab-ci.yml from the master branch

[Federico Mena Quintero <federico src gnome org>]

commit 98c0eba85628d91e60d93f457417d003fed3319e
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Jul 24 18:49:49 2019 -0500

    Update .gitlab-ci.yml from the master branch

 .gitlab-ci.yml | 88 ++++++++++++++++++++--------------------------------------
 1 file changed, 30 insertions(+), 58 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2744299e..bfcff8dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,29 +70,6 @@ stages:
     stage: rustc
     <<: *test
 
-# Jobs that are marked with stage_1 will be run on every commit, across every
-# fork and branch. This only serves as documentation since it's equivelant to
-# ommiting only: key. Thus why stage_1 jobs might not be marked.
-.test_stage_1: &stage_1
-  only: {}
-
-# Jobs that are marked as stage 2 will be run for every commit
-# at GNOME/librsvg/master too. Ideal targets for this stage are
-# debug cross_distro tests, and debug cross_arch tests to avoid
-# breakign i386 and arm builds again.
-.test_stage_2: &stage_2
-  only:
-    # When branching a stable branch,
-    # update the following line from master to branch's name.
-    - librsvg-2.44@GNOME/librsvg
-    - librsvg-2.42@GNOME/librsvg
-    - master@GNOME/librsvg
-    - librsvg-2.44
-    - librsvg-2.42
-    - schedules
-    - tags
-    - web
-
 # Jobs that are marked as stage 3 will only run on scheduled pipelines.
 # Ideal targets for this stage are expensive task, that only need to be run
 # on a regular time interval. Ex testing all the gcc/rustc version that we target
@@ -112,6 +89,36 @@ fedora test:
     LIBRSVG_DEBUG: "yes"
   <<: *test
 
+fedora:rawhide:
+  image: $AMD64_FEDORA_RAWHIDE
+  allow_failure: true
+  variables:
+    LIBRSVG_DEBUG: "yes"
+  <<: *distro_test
+
+.opensuse:tumbleweed:
+  image: $AMD64_OPENSUSE_TUMBLEWEED
+  variables:
+    LIBRSVG_DEBUG: "yes"
+  <<: *distro_test
+
+debian:testing:
+  image: $AMD64_DEBIAN_TESTING
+  allow_failure: true
+  variables:
+    LIBRSVG_DEBUG: "yes"
+  before_script:
+    - export PATH=$PATH:/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0
+  <<: *distro_test
+
+debian_i386:testing:
+  image: $I386_DEBIAN_TESTING
+  variables:
+    LIBRSVG_DEBUG: "yes"
+  before_script:
+    - export PATH=$PATH:/usr/lib/i386-linux-gnu/gdk-pixbuf-2.0
+  <<: *distro_test
+
 # STAGE 1 LINTS
 ########################################################################
 
@@ -148,42 +155,7 @@ tarball:
     - cd _build
     - ../autogen.sh --enable-gtk-doc --enable-vala
     - make distcheck DESTDIR=/tmp/distcheck
-  <<: *stage_2
-
-# STAGE 2 CROSS DISTRO TESTS
-#######################################################################
-
-fedora:rawhide:
-  image: $AMD64_FEDORA_RAWHIDE
-  variables:
-    LIBRSVG_DEBUG: "yes"
-  <<: *distro_test
-  <<: *stage_2
-
-opensuse:tumbleweed:
-  image: $AMD64_OPENSUSE_TUMBLEWEED
-  variables:
-    LIBRSVG_DEBUG: "yes"
-  <<: *distro_test
-  <<: *stage_2
 
-debian:testing:
-  image: $AMD64_DEBIAN_TESTING
-  variables:
-    LIBRSVG_DEBUG: "yes"
-  before_script:
-    - export PATH=$PATH:/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0
-  <<: *distro_test
-  <<: *stage_2
-
-debian_i386:testing:
-  image: $I386_DEBIAN_TESTING
-  variables:
-    LIBRSVG_DEBUG: "yes"
-  before_script:
-    - export PATH=$PATH:/usr/lib/i386-linux-gnu/gdk-pixbuf-2.0
-  <<: *distro_test
-  <<: *stage_2
 
 # STAGE 3 CROSS DISTRO TESTS
 #######################################################################