From 8fb355bdfd8a1f0433fd714c9cdad817640d9f02 Mon Sep 17 00:00:00 2001 From: Kurt Boberg Date: Thu, 5 Dec 2019 00:29:41 +0000 Subject: [PATCH 1/4] add 'security' tag to SAST and Dependency-Scanning Templates --- .../ci/templates/Security/Dependency-Scanning.gitlab-ci.yml | 2 ++ lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml index a37714eeed3f38..e62b9b42a8b0fb 100644 --- a/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml @@ -12,6 +12,8 @@ variables: dependency_scanning: stage: test + tags: + - security image: docker:stable variables: DOCKER_DRIVER: overlay2 diff --git a/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml index 75594eeb619b11..bf62c5326925ac 100644 --- a/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml @@ -12,6 +12,8 @@ variables: SCAN_KUBERNETES_MANIFESTS: "false" sast: + tags: + - security stage: test allow_failure: true artifacts: -- GitLab From a97cb6ea49cfac86a8c5ae9b89e6ddd995826acd Mon Sep 17 00:00:00 2001 From: Kurt Boberg Date: Thu, 5 Dec 2019 00:42:39 +0000 Subject: [PATCH 2/4] add changelog for merge request 21216 --- changelogs/unreleased/21216-sast-di-security-tag.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/21216-sast-di-security-tag.yml diff --git a/changelogs/unreleased/21216-sast-di-security-tag.yml b/changelogs/unreleased/21216-sast-di-security-tag.yml new file mode 100644 index 00000000000000..39886bcf41b04f --- /dev/null +++ b/changelogs/unreleased/21216-sast-di-security-tag.yml @@ -0,0 +1,5 @@ +--- +title: Add 'security' tag to SAST and Dependency-Scanning CI templates +merge_request: 21216 +author: Kurt boberg +type: added \ No newline at end of file -- GitLab From 449bb02046ef3e8c4ee6d12aa52bde5fdc79caa2 Mon Sep 17 00:00:00 2001 From: Kurt Boberg Date: Thu, 5 Dec 2019 20:07:56 +0000 Subject: [PATCH 3/4] trailing newline for changelog --- changelogs/unreleased/21216-sast-di-security-tag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/unreleased/21216-sast-di-security-tag.yml b/changelogs/unreleased/21216-sast-di-security-tag.yml index 39886bcf41b04f..a439400da17063 100644 --- a/changelogs/unreleased/21216-sast-di-security-tag.yml +++ b/changelogs/unreleased/21216-sast-di-security-tag.yml @@ -2,4 +2,4 @@ title: Add 'security' tag to SAST and Dependency-Scanning CI templates merge_request: 21216 author: Kurt boberg -type: added \ No newline at end of file +type: added -- GitLab From 0f40baf6c817743a49b599562a371c861e5e998c Mon Sep 17 00:00:00 2001 From: Kurt Boberg Date: Thu, 5 Dec 2019 20:11:09 +0000 Subject: [PATCH 4/4] Fix rogue trailing space --- lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml index bf62c5326925ac..dd234765bd8b14 100644 --- a/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml @@ -12,7 +12,7 @@ variables: SCAN_KUBERNETES_MANIFESTS: "false" sast: - tags: + tags: - security stage: test allow_failure: true -- GitLab