Commit 6c5015ef authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch '48399-skip-auto-devops-jobs-based-on-license' into 'master'

Skip creating auto devops jobs for sast, container_scanning, dast,…

See merge request gitlab-org/gitlab-ce!21959
parents 1b5c0b47 2c2556f9
---
title: Skip creating auto devops jobs for sast, container_scanning, dast, dependency_scanning
when not licensed
merge_request: 21959
author:
type: performance
...@@ -162,7 +162,10 @@ sast: ...@@ -162,7 +162,10 @@ sast:
artifacts: artifacts:
paths: [gl-sast-report.json] paths: [gl-sast-report.json]
only: only:
refs:
- branches - branches
variables:
- $GITLAB_FEATURES =~ /\bsast\b/
except: except:
variables: variables:
- $SAST_DISABLED - $SAST_DISABLED
...@@ -179,7 +182,10 @@ dependency_scanning: ...@@ -179,7 +182,10 @@ dependency_scanning:
artifacts: artifacts:
paths: [gl-dependency-scanning-report.json] paths: [gl-dependency-scanning-report.json]
only: only:
refs:
- branches - branches
variables:
- $GITLAB_FEATURES =~ /\bdependency_scanning\b/
except: except:
variables: variables:
- $DEPENDENCY_SCANNING_DISABLED - $DEPENDENCY_SCANNING_DISABLED
...@@ -196,7 +202,10 @@ container_scanning: ...@@ -196,7 +202,10 @@ container_scanning:
artifacts: artifacts:
paths: [gl-container-scanning-report.json] paths: [gl-container-scanning-report.json]
only: only:
refs:
- branches - branches
variables:
- $GITLAB_FEATURES =~ /\bsast_container\b/
except: except:
variables: variables:
- $CONTAINER_SCANNING_DISABLED - $CONTAINER_SCANNING_DISABLED
...@@ -215,6 +224,8 @@ dast: ...@@ -215,6 +224,8 @@ dast:
refs: refs:
- branches - branches
kubernetes: active kubernetes: active
variables:
- $GITLAB_FEATURES =~ /\bdast\b/
except: except:
refs: refs:
- master - master
......
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