Image as env var. (#17828)

.gitlab-ci.yml

@@ -12,6 +12,9 @@ include:
 
 variables:
   BUILD: "yes"
+  IMAGE_BUILD_SERVER: $CI_REGISTRY/mattermost/ci/images/mattermost-build-server:20201119_golang-1.15.5
+  IMAGE_BUILD_DOCKER: $CI_REGISTRY/mattermost/ci/images/mattermost-build-docker:19.03.14-1
+  IMAGE_DIND: $CI_REGISTRY/mattermost/ci/images/docker-dind:19.03.14-1
 
 empty:
   stage: create-vars
@@ -30,7 +33,7 @@ empty:
     - if: '$CI_COMMIT_REF_NAME == "master"'
 
 .layers: # Commenting this job, because it is run in CircleCI
-  image: $CI_REGISTRY/mattermost/ci/images/mattermost-build-server:20201119_golang-1.15.5
+  image: $IMAGE_BUILD_SERVER
   stage: test
   script:
     - make store-layers
@@ -44,9 +47,9 @@ empty:
 
 .test-mysql: # Commenting this job, because it is run in CircleCI
   stage: test
-  image: $CI_REGISTRY/mattermost/ci/images/mattermost-build-docker:19.03.14-1
+  image: $IMAGE_BUILD_DOCKER
   services:
-    - name: $CI_REGISTRY/mattermost/ci/images/docker-dind:19.03.14-1
+    - name: $IMAGE_DIND
       alias: docker
   variables:
     DOCKER_TLS_CERTDIR: ""
@@ -74,9 +77,9 @@ empty:
 
 .test-postgres: # Commenting this job, because it is run in CircleCI
   stage: test
-  image: $CI_REGISTRY/mattermost/ci/images/mattermost-build-docker:19.03.14-1
+  image: $IMAGE_BUILD_DOCKER
   services:
-    - name: $CI_REGISTRY/mattermost/ci/images/docker-dind:19.03.14-1
+    - name: $IMAGE_DIND
       alias: docker
   variables:
     DOCKER_TLS_CERTDIR: ""
@@ -104,9 +107,9 @@ empty:
 
 test-schema-mysql:
   stage: test
-  image: $CI_REGISTRY/mattermost/ci/images/mattermost-build-docker:19.03.14-1
+  image: $IMAGE_BUILD_DOCKER
   services:
-    - name: $CI_REGISTRY/mattermost/ci/images/docker-dind:19.03.14-1
+    - name: $IMAGE_DIND
       alias: docker
   variables:
     DOCKER_TLS_CERTDIR: ""
@@ -126,9 +129,9 @@ test-schema-mysql:
 
 test-schema-postgres:
   stage: test
-  image: $CI_REGISTRY/mattermost/ci/images/mattermost-build-docker:19.03.14-1
+  image: $IMAGE_BUILD_DOCKER
   services:
-    - name: $CI_REGISTRY/mattermost/ci/images/docker-dind:19.03.14-1
+    - name: $IMAGE_DIND
       alias: docker
   variables:
     DOCKER_TLS_CERTDIR: ""

.gitlab-ci/scripts/test-schema/mysql.sh

@@ -23,7 +23,7 @@ docker run -d -it --rm --name "${CONTAINER_SERVER}" --net ${DOCKER_NETWORK} \
   --env MM_SQLSETTINGS_DRIVERNAME=mysql \
   -v $CI_PROJECT_DIR:/mattermost-server \
   -w /mattermost-server \
-  ${CI_REGISTRY}/mattermost/ci/images/mattermost-build-server:20201119_golang-1.15.5 \
+  $IMAGE_BUILD_SERVER \
   bash -c "ulimit -n 8096; make ARGS='version' run-cli && make MM_SQLSETTINGS_DATASOURCE='mmuser:mostest@tcp(mysql:3306)/latest?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s' ARGS='version' run-cli"
 docker logs -f "${CONTAINER_SERVER}"
 

.gitlab-ci/scripts/test-schema/postgres.sh

@@ -22,7 +22,7 @@ docker run -d -it --rm --name "${CONTAINER_SERVER}" --net ${DOCKER_NETWORK} \
   --env MM_SQLSETTINGS_DRIVERNAME=postgres \
   -v $CI_PROJECT_DIR:/mattermost-server \
   -w /mattermost-server \
-  ${CI_REGISTRY}/mattermost/ci/images/mattermost-build-server:20201119_golang-1.15.5 \
+  $IMAGE_BUILD_SERVER \
   bash -c "ulimit -n 8096; make ARGS='version' run-cli && make MM_SQLSETTINGS_DATASOURCE='postgres://mmuser:mostest@postgres:5432/latest?sslmode=disable&connect_timeout=10' ARGS='version' run-cli"
 docker logs -f "${CONTAINER_SERVER}"
 

.gitlab-ci/scripts/test/mysql.sh

@@ -22,7 +22,7 @@ docker run -d -it --rm --name "${CONTAINER_SERVER}" --net ${DOCKER_NETWORK} \
   --env MM_SQLSETTINGS_DRIVERNAME=mysql \
   -v ${CI_PROJECT_DIR}:/mattermost-server \
   -w /mattermost-server \
-  ${CI_REGISTRY}/mattermost/ci/images/mattermost-build-server:20201119_golang-1.15.5 \
+  $IMAGE_BUILD_SERVER \
   bash -c "ulimit -n 8096; make test-server$RACE_MODE BUILD_NUMBER=$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA TESTFLAGS= TESTFLAGSEE=" \
   bash -c scripts/diff-email-templates.sh
 mkdir -p logs

.gitlab-ci/scripts/test/postgres.sh

@@ -21,7 +21,7 @@ docker run -d -it --rm --name "${CONTAINER_SERVER}" --net ${DOCKER_NETWORK} \
   --env MM_SQLSETTINGS_DRIVERNAME=postgres \
   -v $CI_PROJECT_DIR:/mattermost-server \
   -w /mattermost-server \
-  ${CI_REGISTRY}/mattermost/ci/images/mattermost-build-server:20201119_golang-1.15.5 \
+  $IMAGE_BUILD_SERVER \
   bash -c "ulimit -n 8096; make test-server$RACE_MODE BUILD_NUMBER=$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA TESTFLAGS= TESTFLAGSEE=" \
   bash -c scripts/diff-email-templates.sh
 mkdir -p logs