diff options
| author | Philippe Lafoucrière <plafoucriere@gitlab.com> | 2018-11-04 22:48:05 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-11-04 22:48:05 +0000 |
| commit | ccb1ff9aca69ad6b01bcb9881aa8836741b070b3 (patch) | |
| tree | e0b714558034d5959ddb5ab2a8ae995013aebb91 | |
| parent | ccc5b740820e983887b49f2c5d449280ce118ddf (diff) | |
| download | gitlab-ce-ccb1ff9aca69ad6b01bcb9881aa8836741b070b3.tar.gz | |
Update license_management job
| -rw-r--r-- | changelogs/unreleased/update_license_management_job.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 11 |
2 files changed, 7 insertions, 9 deletions
diff --git a/changelogs/unreleased/update_license_management_job.yml b/changelogs/unreleased/update_license_management_job.yml new file mode 100644 index 00000000000..d6e56080e77 --- /dev/null +++ b/changelogs/unreleased/update_license_management_job.yml @@ -0,0 +1,5 @@ +--- +title: "Remove dind from license_management auto-devops job definition" +merge_request: 22732 +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 734af5eba59..5a8cd92b75f 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -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() { |