[gnome-build-meta/doraskayo/update-ci-image] .gitlab-ci.yml: Update container image

[Dor Askayo <doraskayo src gnome org>]

commit b20283bf63ed885e3b26a37ee279f76b5ba91b48
Author: Dor Askayo <dor askayo gmail com>
Date:   Sun Dec 5 19:25:20 2021 +0200

    .gitlab-ci.yml: Update container image
    
    This aligns our CI container image version to that of
    freedesktop-sdk. Having them aligned should maximize cache hits.
    
    Since images are no longer prefixed for each architecture, also
    simplify their configuration and move their declaration from
    .gitlab-ci/arch.yml to .gitlab-ci.yml.

 .gitlab-ci.yml      |  9 +++++++--
 .gitlab-ci/arch.yml | 12 ------------
 2 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af7c39c2b..c58840f56 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,3 @@
-include: .gitlab-ci/arch.yml
-
 variables:
   GET_SOURCES_ATTEMPTS: 3
   BST_STRICT: '--no-strict'
@@ -11,6 +9,10 @@ variables:
   OPENQA_NEEDLES_GIT: https://gitlab.gnome.org/gnome/openqa-needles
   OPENQA_NEEDLES_SHA: master
 
+  # Docker Images
+  DOCKER_REGISTRY: "registry.gitlab.com/freedesktop-sdk/infrastructure/freedesktop-sdk-docker-images"
+  DOCKER_IMAGE_ID: "a5c6fe9b400c10afa7b5268f0d23d028f128679f"
+
 stages:
 - track
 - build
@@ -20,6 +22,7 @@ stages:
 - reports
 
 default:
+  image: "${DOCKER_REGISTRY}/bst16:${DOCKER_IMAGE_ID}"
   before_script:
   # Ensure the log directory exists
   - mkdir -p logs
@@ -28,6 +31,8 @@ default:
   - echo "$GITLAB_CAS_PUSH_CERT" > client.crt
   - echo "$GITLAB_CAS_PUSH_KEY" > client.key
 
+include: .gitlab-ci/arch.yml
+
 #
 # Templates shared by multiple jobs
 #
diff --git a/.gitlab-ci/arch.yml b/.gitlab-ci/arch.yml
index b8e798ab5..28e318a27 100644
--- a/.gitlab-ci/arch.yml
+++ b/.gitlab-ci/arch.yml
@@ -1,17 +1,8 @@
-variables:
-  # Docker Images
-  DOCKER_REGISTRY: "registry.gitlab.com/freedesktop-sdk/infrastructure/freedesktop-sdk-docker-images"
-  DOCKER_IMAGE_ID: "307dbb43c80db04234f505f1ff4061772f948e5f"
-
-  DOCKER_AMD64: "${DOCKER_REGISTRY}/bst16/amd64:${DOCKER_IMAGE_ID}"
-  DOCKER_AARCH64: "${DOCKER_REGISTRY}/bst16/arm64:${DOCKER_IMAGE_ID}"
-
 #
 # Architecture specific settings
 #
 
 .x86_64:
-  image: "${DOCKER_AMD64}"
   tags:
   - x86_64
   - gnome-build-meta
@@ -19,7 +10,6 @@ variables:
     ARCH: x86_64
 
 .i686:
-  image: "${DOCKER_AMD64}"
   tags:
   - x86_64
   - gnome-build-meta
@@ -27,7 +17,6 @@ variables:
     ARCH: i686
 
 .aarch64:
-  image: "${DOCKER_AARCH64}"
   tags:
   - aarch64
   - gnome-build-meta
@@ -35,7 +24,6 @@ variables:
     ARCH: aarch64
 
 .arm:
-  image: "${DOCKER_AARCH64}"
   tags:
   - armhf
   - gnome-build-meta