diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-17 21:08:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-17 21:08:14 +0300 |
| commit | 3db45dfaaebc6dabf75a3c1a8037aa0f34352991 (patch) | |
| tree | afc90ab03b3d21c7164001cc8173a6fe44a8817c | |
| parent | 487c7608d8607d360cc477b3c5200c39946a779a (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml index b235a184a9f..87f78d0c887 100644 --- a/lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml @@ -1,25 +1,13 @@ # Deprecated: https://gitlab.com/gitlab-org/gitlab/issues/14624 # Please, use License-Scanning.gitlab-ci.yml template instead -license_management: - stage: test - image: alpine:latest - allow_failure: false - script: +include: + - template: License-Scanning.gitlab-ci.yml + +license_scanning: + before_script: - | - echo "Sorry for failing your pipeline! - As of GitLab 13.0, we have removed the License-Management.gitlab.ci.yml template (deprecated since GitLab 12.8). + echo "As of GitLab 12.8, we deprecated the License-Management.gitlab.ci.yml template. Please replace it with the License-Scanning.gitlab-ci.yml template instead. For more details visit https://docs.gitlab.com/ee/user/compliance/license_compliance/#migration-from-license_management-to-license_scanning" - - exit 1 - only: - refs: - - branches - variables: - - $GITLAB_FEATURES =~ /\blicense_scanning\b/ - except: - refs: - - master - variables: - - $LICENSE_MANAGEMENT_DISABLED |