Commit b8286989 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'update_license_management_job' into 'master'

Update license_management job

See merge request gitlab-org/gitlab-ce!22732
parents ccc5b740 ccb1ff9a
---
title: "Remove dind from license_management auto-devops job definition"
merge_request: 22732
author:
type: performance
......@@ -116,12 +116,9 @@ code_quality:
license_management:
stage: test
image: docker:stable
image: "registry.gitlab.com/gitlab-org/security-products/license-management:$CI_SERVER_VERSION_MAJOR-$CI_SERVER_VERSION_MINOR-stable"
allow_failure: true
services:
- docker:stable-dind
script:
- setup_docker
- license_management
artifacts:
paths: [gl-license-management-report.json]
......@@ -525,11 +522,7 @@ rollout 100%:
}
function license_management() {
# 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
/run.sh analyze .
}
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