kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '4907-improve-build-create-performance-for-license-management' into 'master' 

Dont create license_management build when not included in license

See merge request gitlab-org/gitlab-ce!21958
This commit is contained in:
Kamil Trzciński 2018-09-27 14:28:37 +00:00
parent f7e28d265c df796a4212
commit 106bc23d33
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/4907-improve-build-create-performance-for-license-management.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Dont create license_management build when not included in license
merge_request: 21958
author:
type: performance

15
lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
View File

@ -122,6 +122,9 @@ license_management:
paths: [gl-license-management-report.json] paths: [gl-license-management-report.json]
only: only:
- branches - branches
only:
variables:
- $GITLAB_FEATURES =~ /\blicense_management\b/
except: except:
variables: variables:
- $LICENSE_MANAGEMENT_DISABLED - $LICENSE_MANAGEMENT_DISABLED
@ -484,15 +487,11 @@ rollout 100%:
} }
function license_management() { function license_management() {
if echo $GITLAB_FEATURES |grep license_management > /dev/null ; then # Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable"
# Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable" LICENSE_MANAGEMENT_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
LICENSE_MANAGEMENT_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
docker run --volume "$PWD:/code" \ docker run --volume "$PWD:/code" \
"registry.gitlab.com/gitlab-org/security-products/license-management:$LICENSE_MANAGEMENT_VERSION" analyze /code "registry.gitlab.com/gitlab-org/security-products/license-management:$LICENSE_MANAGEMENT_VERSION" analyze /code
else
echo "License management is not available in your subscription"
fi
} }
function sast() { function sast() {