Commit 776975cb authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'update_vendored_ADO_template_with_license_management' into 'master'

Update vendored ADO template with adding of license management

See merge request gitlab-org/gitlab-ce!19496
parents bc5fd641 dd4e6bb9
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# Test jobs may be disabled by setting environment variables: # Test jobs may be disabled by setting environment variables:
# * test: TEST_DISABLED # * test: TEST_DISABLED
# * code_quality: CODE_QUALITY_DISABLED # * code_quality: CODE_QUALITY_DISABLED
# * license_management: LICENSE_MANAGEMENT_DISABLED
# * performance: PERFORMANCE_DISABLED # * performance: PERFORMANCE_DISABLED
# * sast: SAST_DISABLED # * sast: SAST_DISABLED
# * dependency_scanning: DEPENDENCY_SCANNING_DISABLED # * dependency_scanning: DEPENDENCY_SCANNING_DISABLED
...@@ -108,6 +109,22 @@ code_quality: ...@@ -108,6 +109,22 @@ code_quality:
variables: variables:
- $CODE_QUALITY_DISABLED - $CODE_QUALITY_DISABLED
license_management:
image: docker:stable
variables:
DOCKER_DRIVER: overlay2
allow_failure: true
services:
- docker:stable-dind
script:
- setup_docker
- license_management
artifacts:
paths: [gl-license-management-report.json]
except:
variables:
- $LICENSE_MANAGEMENT_DISABLED
performance: performance:
stage: performance stage: performance
image: docker:stable image: docker:stable
...@@ -462,6 +479,18 @@ rollout 100%: ...@@ -462,6 +479,18 @@ rollout 100%:
"registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
} }
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/')
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
}
function sast() { function sast() {
case "$CI_SERVER_VERSION" in case "$CI_SERVER_VERSION" in
*-ee) *-ee)
......
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