Commit df796a42 authored by Dylan Griffith's avatar Dylan Griffith

Dont create license_management build when not included in license

This improves CI performance since we do not create a whole new job that
just exits quickly. This is important based on
https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/4907#note_104742212
parent 7c1cfd0b
---
title: Dont create license_management build when not included in license
merge_request: 21958
author:
type: performance
...@@ -122,6 +122,9 @@ license_management: ...@@ -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%: ...@@ -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() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment