diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-07 18:08:29 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-07 18:08:29 +0000 |
| commit | c2bdb9d02768a61bee7560113f4d4c83dc91338e (patch) | |
| tree | e242f8d39df80ec39a59eb73ad96ee389c8a4d41 /.gitlab-ci.yml | |
| parent | fe4751154c331e35c0e6575a3aedc02b210a1c63 (diff) | |
| download | gitlab-ce-c2bdb9d02768a61bee7560113f4d4c83dc91338e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac072f69b5b..c62de7d7ab0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ stages: # in cases where jobs require Docker-in-Docker, the job # definition must be extended with `.use-docker-in-docker` default: - image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:debian-${DEBIAN_VERSION}-ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-97-node-16.14-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 + image: $DEFAULT_CI_IMAGE tags: - gitlab-org # All jobs are interruptible by default @@ -58,6 +58,8 @@ workflow: - if: '$CI_COMMIT_BRANCH =~ /^security\//' variables: + PG_VERSION: "12" + DEFAULT_CI_IMAGE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:debian-${DEBIAN_VERSION}-ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-97-node-16.14-yarn-1.22-postgresql-${PG_VERSION}-graphicsmagick-1.3.36" RAILS_ENV: "test" NODE_ENV: "test" BUNDLE_WITHOUT: "production:development" |