diff options
author | Stan Hu <stanhu@gmail.com> | 2018-11-12 15:34:24 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-11-12 15:34:24 +0000 |
commit | b07107c7c0d1b6386cfbce5dcc9cbfd49b7fe4bc (patch) | |
tree | 9f5337ba917dc3a7704ba74a9ef18567ca36fcf0 | |
parent | a12501bcf82fc87099164c753fd4b0dae46a06d1 (diff) | |
parent | a737c4fb5dfa3195891025e08c918532f1a5bac5 (diff) | |
download | gitlab-ce-b07107c7c0d1b6386cfbce5dcc9cbfd49b7fe4bc.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.yml | 4 |
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 |