summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-11-12 15:34:24 +0000
committerCindy Pallares <cindy@gitlab.com>2018-11-13 20:45:41 -0500
commitd65cfbc24f60281daad34759147ab7fb94fe4009 (patch)
tree1d76242343ab21ed3740a7ea57870950447ea28d
parent47eeee1543e2c715993da837f46069678a1780c6 (diff)
downloadgitlab-ce-d65cfbc24f60281daad34759147ab7fb94fe4009.tar.gz
Merge branch 'patch-31' into 'master'
Set an empty entrypoint for license_management job Closes #53786 See merge request gitlab-org/gitlab-ce!22955
-rw-r--r--lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
index c759bb7098e..ec949c290bd 100644
--- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
@@ -116,7 +116,9 @@ code_quality:
license_management:
stage: test
- image: "registry.gitlab.com/gitlab-org/security-products/license-management:$CI_SERVER_VERSION_MAJOR-$CI_SERVER_VERSION_MINOR-stable"
+ image:
+ name: "registry.gitlab.com/gitlab-org/security-products/license-management:$CI_SERVER_VERSION_MAJOR-$CI_SERVER_VERSION_MINOR-stable"
+ entrypoint: [""]
allow_failure: true
script:
- license_management