[gnome-build-meta/jjardon/new_docker_images] .gitlab-ci.yml: Use new docker images with buildstream and plugins installed

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 953722e33495e4eeb05416c6e718e6eefe390b7c
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Feb 15 20:36:40 2019 +0000

    .gitlab-ci.yml: Use new docker images with buildstream and plugins installed

 .gitlab-ci.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a9c1fdec..bce359fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,11 @@ variables:
   BST_EXTERNAL_SHA: '0.8.0-0-g762ea216b751bf89ac15350e1cb98542963bbf33'
   FLATPAK_BRANCH: master
 
+  # Docker Images
+  DOCKER_REGISTRY: "registry.gitlab.com/freedesktop-sdk/infrastructure/freedesktop-sdk-docker-images"
+  DOCKER_AMD64: "${DOCKER_REGISTRY}/amd64:e132e7bf9180b30c6ad0f4b057442cc2f2a0aa86"
+  DOCKER_AARCH64: "${DOCKER_REGISTRY}/aarch64:e132e7bf9180b30c6ad0f4b057442cc2f2a0aa86"
+
 stages:
   - track
   - build
@@ -25,6 +30,7 @@ cache:
 before_script:
   # Remove any installed buildstream binary
   - pip3 uninstall -y buildstream
+  - pip3 uninstall -y buildstream-external
 
   # Use specific version of BuildStream
   - git clone https://gitlab.com/BuildStream/buildstream.git
@@ -101,9 +107,6 @@ before_script:
 .flatpak-template:
   stage: flatpak
   script:
-    # flatpak and rsync to generate and transfer the flatpak runtimes
-    - dnf install -y flatpak rsync
-
     - ${BST} -o arch "${ARCH}" build flatpak-runtimes.bst
     - bst -o arch "${ARCH}" checkout --hardlinks flatpak-runtimes.bst repo/
 
@@ -153,7 +156,7 @@ before_script:
 #
 
 .x86_64: &x86_64
-  image: buildstream/buildstream-fedora:master-123-abef70fe
+  image: "${DOCKER_AMD64}"
   tags:
     - x86_64
     - gnome-build-meta
@@ -161,7 +164,7 @@ before_script:
     ARCH: x86_64
 
 .i686: &i686
-  image: buildstream/buildstream-fedora:master-123-abef70fe
+  image: "${DOCKER_AMD64}"
   tags:
     - x86_64
     - gnome-build-meta
@@ -169,7 +172,7 @@ before_script:
     ARCH: i686
 
 .aarch64: &aarch64
-  image: buildstream/buildstream-fedora:aarch64-master-123-abef70fe
+  image: "${DOCKER_AARCH64}"
   tags:
     - aarch64
     - gnome-build-meta
@@ -177,7 +180,7 @@ before_script:
     ARCH: aarch64
 
 .arm: &arm
-  image: buildstream/buildstream-fedora:aarch64-master-123-abef70fe
+  image: "${DOCKER_AARCH64}"
   tags:
     - armhf
     - gnome-build-meta