diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 03:09:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 03:09:21 +0300 |
| commit | ce2a803dc413f289352deecbf2cfd32896c8b2ef (patch) | |
| tree | a19f57942ed8d497298afb416fd48dcc9e68f5be /lib | |
| parent | cfaf1cca4403b826af2286b1ab0a69ad01c58738 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
3 files changed, 10 insertions, 5 deletions
diff --git a/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml index 426f0238f9d..c3ca44eea9e 100644 --- a/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml @@ -1,11 +1,13 @@ performance: stage: performance - image: docker:stable + # pin to a version matching the dind service, just to be safe + image: docker:19.03.5 allow_failure: true variables: DOCKER_TLS_CERTDIR: "" services: - - docker:stable-dind + # pin to a known working version until https://gitlab.com/gitlab-org/gitlab-runner/issues/6697 is fixed + - docker:19.03.5-dind script: - | if ! docker info &>/dev/null; then diff --git a/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml index 8061da968ed..488945ffa3e 100644 --- a/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml @@ -4,7 +4,8 @@ build: variables: DOCKER_TLS_CERTDIR: "" services: - - docker:stable-dind + # pin to a known working version until https://gitlab.com/gitlab-org/gitlab-runner/issues/6697 is fixed + - docker:19.03.5-dind script: - | if [[ -z "$CI_COMMIT_TAG" ]]; then diff --git a/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml index 8bc60a36ebd..dd5144e28a7 100644 --- a/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml @@ -1,9 +1,11 @@ code_quality: stage: test - image: docker:stable + # pin to a version matching the dind service, just to be safe + image: docker:19.03.5 allow_failure: true services: - - docker:stable-dind + # pin to a known working version until https://gitlab.com/gitlab-org/gitlab-runner/issues/6697 is fixed + - docker:19.03.5-dind variables: DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "" |