Port new group runner kubernetes section to EE

EE port needed due to gitlab.pot conflicts

Port new group runner kubernetes section to EE
EE port needed due to gitlab.pot conflicts
6f94cd3d · Luca Orlandi · Mayra Cabrera · d7301a0d · 6f94cd3d · 6f94cd3d
Commit 6f94cd3d authored Sep 25, 2019 by Luca Orlandi Committed by Mayra Cabrera Sep 25, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

changelogs/unreleased/patch-29.yml changelogs/unreleased/patch-29.yml +5 -0

lib/gitlab/ci/templates/Docker.gitlab-ci.yml lib/gitlab/ci/templates/Docker.gitlab-ci.yml +2 -2

No files found.
--- a/changelogs/unreleased/patch-29.yml
+++ b/changelogs/unreleased/patch-29.yml
+---
+title: Better job naming for Docker.gitlab-ci.yml
+merge_request: 17218
+author: luca.orlandi@gmail.com
+type: other
--- a/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
-build-master:
+docker-build-master:
  # Official docker image.
  image: docker:latest
  stage: build
@@ -12,7 +12,7 @@ build-master:
  only:
    - master
-build:
+docker-build:
  # Official docker image.
  image: docker:latest
  stage: build