Merge branch 'revert-db6cedda' into 'master'
Revert "Merge branch 'auto-devops-support-for-group-security-dashboard' into 'master'" See merge request gitlab-org/gitlab-ce!23530
This commit is contained in:
commit
a82833bcea
|
@ -1,5 +0,0 @@
|
||||||
---
|
|
||||||
title: Auto DevOps support for Group Security Dashboard
|
|
||||||
merge_request: 23165
|
|
||||||
author:
|
|
||||||
type: fixed
|
|
|
@ -666,8 +666,6 @@ also be customized, and you can easily use a [custom buildpack](#custom-buildpac
|
||||||
| `REVIEW_DISABLED` | From GitLab 11.0, this variable can be used to disable the `review` and the manual `review:stop` job. If the variable is present, these jobs will not be created. |
|
| `REVIEW_DISABLED` | From GitLab 11.0, this variable can be used to disable the `review` and the manual `review:stop` job. If the variable is present, these jobs will not be created. |
|
||||||
| `DAST_DISABLED` | From GitLab 11.0, this variable can be used to disable the `dast` job. If the variable is present, the job will not be created. |
|
| `DAST_DISABLED` | From GitLab 11.0, this variable can be used to disable the `dast` job. If the variable is present, the job will not be created. |
|
||||||
| `PERFORMANCE_DISABLED` | From GitLab 11.0, this variable can be used to disable the `performance` job. If the variable is present, the job will not be created. |
|
| `PERFORMANCE_DISABLED` | From GitLab 11.0, this variable can be used to disable the `performance` job. If the variable is present, the job will not be created. |
|
||||||
| `OLD_REPORTS_DISABLED` | From GitLab 11.5, this variable can be used to disable the `sast` job. If the variable is present, the job will not be created. |
|
|
||||||
| `NEW_REPORTS_DISABLED` | From GitLab 11.5, this variable can be used to disable the `sast_dashboard` job. If the variable is present, the job will not be created. |
|
|
||||||
|
|
||||||
TIP: **Tip:**
|
TIP: **Tip:**
|
||||||
Set up the replica variables using a
|
Set up the replica variables using a
|
||||||
|
|
|
@ -19,15 +19,6 @@
|
||||||
# * review: REVIEW_DISABLED
|
# * review: REVIEW_DISABLED
|
||||||
# * stop_review: REVIEW_DISABLED
|
# * stop_review: REVIEW_DISABLED
|
||||||
#
|
#
|
||||||
# The sast and sast_dashboard jobs are executed to guarantee full compatibility
|
|
||||||
# with the group security dashboard and the security reports with old runners.
|
|
||||||
# If you use only runners with version 11.5 or above, you can disable the sast
|
|
||||||
# job by setting the OLD_REPORTS_DISABLED environment variable. If you use only
|
|
||||||
# runners with version below 11.5, you can disable the sast_dashboard job by
|
|
||||||
# setting the NEW_REPORTS_DISABLED environment variable.
|
|
||||||
# The sast_dashboard job will be removed in the future, when the sast job will
|
|
||||||
# use the new reports syntax.
|
|
||||||
#
|
|
||||||
# In order to deploy, you must have a Kubernetes cluster configured either
|
# In order to deploy, you must have a Kubernetes cluster configured either
|
||||||
# via a project integration, or via group/project variables.
|
# via a project integration, or via group/project variables.
|
||||||
# AUTO_DEVOPS_DOMAIN must also be set as a variable at the group or project
|
# AUTO_DEVOPS_DOMAIN must also be set as a variable at the group or project
|
||||||
|
@ -182,29 +173,6 @@ sast:
|
||||||
except:
|
except:
|
||||||
variables:
|
variables:
|
||||||
- $SAST_DISABLED
|
- $SAST_DISABLED
|
||||||
- $OLD_REPORTS_DISABLED
|
|
||||||
|
|
||||||
sast_dashboard:
|
|
||||||
stage: test
|
|
||||||
image: docker:stable
|
|
||||||
allow_failure: true
|
|
||||||
services:
|
|
||||||
- docker:stable-dind
|
|
||||||
script:
|
|
||||||
- setup_docker
|
|
||||||
- sast
|
|
||||||
artifacts:
|
|
||||||
reports:
|
|
||||||
sast: gl-sast-report.json
|
|
||||||
only:
|
|
||||||
refs:
|
|
||||||
- branches
|
|
||||||
variables:
|
|
||||||
- $GITLAB_FEATURES =~ /\bsast\b/
|
|
||||||
except:
|
|
||||||
variables:
|
|
||||||
- $SAST_DISABLED
|
|
||||||
- $NEW_REPORTS_DISABLED
|
|
||||||
|
|
||||||
dependency_scanning:
|
dependency_scanning:
|
||||||
stage: test
|
stage: test
|
||||||
|
|
Loading…
Reference in New Issue