diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-27 14:28:37 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-27 14:28:37 +0000 |
| commit | 106bc23d33251797428f27400eb4f44aa5d7fa2f (patch) | |
| tree | 24cfccd7ead4e37ff5548b30f3441e577ef4af10 | |
| parent | f7e28d265cb088c3a0293f459bd81284ec2a8fa7 (diff) | |
| parent | df796a421298355710fa4422de7ac0b69362b1a6 (diff) | |
| download | gitlab-ce-106bc23d33251797428f27400eb4f44aa5d7fa2f.tar.gz | |
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
| -rw-r--r-- | changelogs/unreleased/4907-improve-build-create-performance-for-license-management.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/changelogs/unreleased/4907-improve-build-create-performance-for-license-management.yml b/changelogs/unreleased/4907-improve-build-create-performance-for-license-management.yml new file mode 100644 index 00000000000..e82bda6819f --- /dev/null +++ b/changelogs/unreleased/4907-improve-build-create-performance-for-license-management.yml @@ -0,0 +1,5 @@ +--- +title: Dont create license_management build when not included in license +merge_request: 21958 +author: +type: performance diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index e3a2534e97a..d8fcdfac266 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -122,6 +122,9 @@ license_management: paths: [gl-license-management-report.json] only: - branches + only: + variables: + - $GITLAB_FEATURES =~ /\blicense_management\b/ except: variables: - $LICENSE_MANAGEMENT_DISABLED @@ -484,15 +487,11 @@ rollout 100%: } 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" - LICENSE_MANAGEMENT_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-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/') - docker run --volume "$PWD:/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 + docker run --volume "$PWD:/code" \ + "registry.gitlab.com/gitlab-org/security-products/license-management:$LICENSE_MANAGEMENT_VERSION" analyze /code } function sast() { |