summaryrefslogtreecommitdiff
path: root/.gitlab/ci/global.gitlab-ci.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-02-22 06:16:10 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-02-22 06:16:10 +0000
commitc123291db91a8c54865779ee29ddebaad159d147 (patch)
treef2ae7834e61890f9d22bc48f3bc1bcf99fb0f3c0 /.gitlab/ci/global.gitlab-ci.yml
parente4011eb84527cb7fd46aa34e07a8cd33746c4a5a (diff)
downloadgitlab-ce-c123291db91a8c54865779ee29ddebaad159d147.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci/global.gitlab-ci.yml')
-rw-r--r--.gitlab/ci/global.gitlab-ci.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index 33b04faf731..98c418a05f8 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -245,7 +245,7 @@
- name: postgres:11.6
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
- name: redis:5.0-alpine
- - name: elasticsearch:7.14.2
+ - name: elasticsearch:7.17.0
command: ["elasticsearch", "-E", "discovery.type=single-node"]
variables:
POSTGRES_HOST_AUTH_METHOD: trust
@@ -256,7 +256,7 @@
- name: postgres:12
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
- name: redis:5.0-alpine
- - name: elasticsearch:7.14.2
+ - name: elasticsearch:7.17.0
command: ["elasticsearch", "-E", "discovery.type=single-node"]
variables:
POSTGRES_HOST_AUTH_METHOD: trust
@@ -267,7 +267,7 @@
- name: postgres:13
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
- name: redis:5.0-alpine
- - name: elasticsearch:7.14.2
+ - name: elasticsearch:7.17.0
command: ["elasticsearch", "-E", "discovery.type=single-node"]
variables:
POSTGRES_HOST_AUTH_METHOD: trust