From 917d5a8e3830349f55c75cf33a91c63847714503 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Mon, 17 Aug 2020 12:40:50 +0100
Subject: [PATCH] CI: Adapt to external-facing Docker registry

Gitlab-CI variables can be set at the project level to override these
Docker images with their equivalents from the internal Docker registry
where desired.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 debian/gitlab-ci.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml
index 6ca5bb0e5..19e1f6656 100644
--- a/debian/gitlab-ci.yml
+++ b/debian/gitlab-ci.yml
@@ -6,7 +6,7 @@ include:
       file: '/steam-gitlab-ci-pipeline.yml'
 
 variables:
-    BUILD_IMAGE: docker.internal.steamos.cloud/steamrt/sdk:scout-latest
+    BUILD_IMAGE: registry.gitlab.steamos.cloud/steamrt/scout/sdk:beta
     STEAM_CI_USE_BINARIES_FROM: autopkgtest
     STEAM_CI_DEPENDENCIES: >-
         debhelper
@@ -36,11 +36,11 @@ variables:
 
     DEBIAN_FRONTEND: noninteractive
 
-    SCOUT_DOCKER_REGISTRY: docker.steamos.cloud
-    SCOUT_DOCKER_IMAGE: steamrt/sdk:scout
+    SCOUT_DOCKER_REGISTRY: registry.gitlab.steamos.cloud
+    SCOUT_DOCKER_IMAGE: steamrt/scout/sdk:beta
     SCOUT_APT_SOURCES_FILE: ''
-    DEVEL_DOCKER_REGISTRY: docker.steamos.cloud
-    DEVEL_DOCKER_IMAGE: steamos/package-builder:buster
+    DEVEL_DOCKER_REGISTRY: ''
+    DEVEL_DOCKER_IMAGE: ''
     # Set non-empty to allow
     CI_ALLOW_MISSING_SOURCES: ''
 
@@ -49,6 +49,8 @@ variables:
 
 build:devel:
     stage: build
+    rules:
+        - if: '$DEVEL_DOCKER_REGISTRY != "" && $DEVEL_DOCKER_IMAGE != ""'
     image: "${DEVEL_DOCKER_REGISTRY}/${DEVEL_DOCKER_IMAGE}"
     script:
         - |
@@ -165,12 +167,10 @@ build:scout:
 # These packaging-oriented jobs need a suitable steam-runtime-tools version
 # available via apt
 build:
-    only:
-        variables:
-            - $CI_NEED_NEWER_STEAM_RUNTIME_TOOLS == ''
+    rules:
+        - if: '$CI_NEED_NEWER_STEAM_RUNTIME_TOOLS == ""'
 autopkgtest:
-    only:
-        variables:
-            - $CI_NEED_NEWER_STEAM_RUNTIME_TOOLS == ''
+    rules:
+        - if: '$CI_NEED_NEWER_STEAM_RUNTIME_TOOLS == ""'
 
 # vim:set sw=4 sts=4 et:
-- 
GitLab