Update license_management job
This commit is contained in:
parent
ccc5b74082
commit
ccb1ff9aca
2 changed files with 7 additions and 9 deletions
5
changelogs/unreleased/update_license_management_job.yml
Normal file
5
changelogs/unreleased/update_license_management_job.yml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: "Remove dind from license_management auto-devops job definition"
|
||||||
|
merge_request: 22732
|
||||||
|
author:
|
||||||
|
type: performance
|
|
@ -116,12 +116,9 @@ code_quality:
|
||||||
|
|
||||||
license_management:
|
license_management:
|
||||||
stage: test
|
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
|
allow_failure: true
|
||||||
services:
|
|
||||||
- docker:stable-dind
|
|
||||||
script:
|
script:
|
||||||
- setup_docker
|
|
||||||
- license_management
|
- license_management
|
||||||
artifacts:
|
artifacts:
|
||||||
paths: [gl-license-management-report.json]
|
paths: [gl-license-management-report.json]
|
||||||
|
@ -525,11 +522,7 @@ rollout 100%:
|
||||||
}
|
}
|
||||||
|
|
||||||
function license_management() {
|
function license_management() {
|
||||||
# Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable"
|
/run.sh analyze .
|
||||||
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
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function sast() {
|
function sast() {
|
||||||
|
|
Loading…
Reference in a new issue