From: Samuel Cabrero Date: Thu, 25 Apr 2019 11:12:42 +0000 (+0200) Subject: .gitlab-ci.yml: Allow overriding the default image using a variable X-Git-Tag: tdb-1.4.1~276 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f2af93a7fc736f2ef3dfe0dbc8bf8c3a2eb4161;p=thirdparty%2Fsamba.git .gitlab-ci.yml: Allow overriding the default image using a variable This way one can run all tests in a different container without having to modify the gitlab ci file, just setting the SAMBA_CI_CONTAINER_IMAGE variable in the gitlab's GUI. Signed-off-by: Samuel Cabrero Reviewed-by: Andrew Bartlett Reviewed-by: Andreas Schneider --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86fd2fb2778..5401a9e27b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,9 @@ variables: # which is generated by bootstrap/template.py --render # SAMBA_CI_CONTAINER_TAG: 4cc4709edd40e4e7c64f9eb255f953eed7924b1f + # We use the ubuntu1804 image as default as + # it matches what we have on sn-devel-184. + SAMBA_CI_CONTAINER_IMAGE: ubuntu1804 # # The following images are available # Please see the samba-o3 sections at the end of this file! @@ -39,9 +42,7 @@ include: .shared_template: variables: AUTOBUILD_JOB_NAME: $CI_JOB_NAME - # We use the ubuntu1804 image as default as - # it matches what we have on sn-devel-184. - image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1804 + image: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-${SAMBA_CI_CONTAINER_IMAGE}:${SAMBA_CI_CONTAINER_TAG} stage: build tags: - docker