Skip to content
Snippets Groups Projects
Commit 917d5a8e authored by Simon McVittie's avatar Simon McVittie
Browse files

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: default avatarSimon McVittie <smcv@collabora.com>
parent f3fb782f
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,7 @@ include: ...@@ -6,7 +6,7 @@ include:
file: '/steam-gitlab-ci-pipeline.yml' file: '/steam-gitlab-ci-pipeline.yml'
variables: 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_USE_BINARIES_FROM: autopkgtest
STEAM_CI_DEPENDENCIES: >- STEAM_CI_DEPENDENCIES: >-
debhelper debhelper
...@@ -36,11 +36,11 @@ variables: ...@@ -36,11 +36,11 @@ variables:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
SCOUT_DOCKER_REGISTRY: docker.steamos.cloud SCOUT_DOCKER_REGISTRY: registry.gitlab.steamos.cloud
SCOUT_DOCKER_IMAGE: steamrt/sdk:scout SCOUT_DOCKER_IMAGE: steamrt/scout/sdk:beta
SCOUT_APT_SOURCES_FILE: '' SCOUT_APT_SOURCES_FILE: ''
DEVEL_DOCKER_REGISTRY: docker.steamos.cloud DEVEL_DOCKER_REGISTRY: ''
DEVEL_DOCKER_IMAGE: steamos/package-builder:buster DEVEL_DOCKER_IMAGE: ''
# Set non-empty to allow # Set non-empty to allow
CI_ALLOW_MISSING_SOURCES: '' CI_ALLOW_MISSING_SOURCES: ''
...@@ -49,6 +49,8 @@ variables: ...@@ -49,6 +49,8 @@ variables:
build:devel: build:devel:
stage: build stage: build
rules:
- if: '$DEVEL_DOCKER_REGISTRY != "" && $DEVEL_DOCKER_IMAGE != ""'
image: "${DEVEL_DOCKER_REGISTRY}/${DEVEL_DOCKER_IMAGE}" image: "${DEVEL_DOCKER_REGISTRY}/${DEVEL_DOCKER_IMAGE}"
script: script:
- | - |
...@@ -165,12 +167,10 @@ build:scout: ...@@ -165,12 +167,10 @@ build:scout:
# These packaging-oriented jobs need a suitable steam-runtime-tools version # These packaging-oriented jobs need a suitable steam-runtime-tools version
# available via apt # available via apt
build: build:
only: rules:
variables: - if: '$CI_NEED_NEWER_STEAM_RUNTIME_TOOLS == ""'
- $CI_NEED_NEWER_STEAM_RUNTIME_TOOLS == ''
autopkgtest: autopkgtest:
only: rules:
variables: - if: '$CI_NEED_NEWER_STEAM_RUNTIME_TOOLS == ""'
- $CI_NEED_NEWER_STEAM_RUNTIME_TOOLS == ''
# vim:set sw=4 sts=4 et: # vim:set sw=4 sts=4 et:
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment