diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
| commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
| tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /spec/support/gitlab_stubs | |
| parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) | |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'spec/support/gitlab_stubs')
4 files changed, 57 insertions, 1 deletions
diff --git a/spec/support/gitlab_stubs/gitlab_ci_for_sast.yml b/spec/support/gitlab_stubs/gitlab_ci_for_sast.yml index c4f3c3aace2..d20078c8904 100644 --- a/spec/support/gitlab_stubs/gitlab_ci_for_sast.yml +++ b/spec/support/gitlab_stubs/gitlab_ci_for_sast.yml @@ -4,7 +4,8 @@ include: variables: SECURE_ANALYZERS_PREFIX: "registry.gitlab.com/gitlab-org/security-products/analyzers2" SAST_EXCLUDED_PATHS: "spec, executables" - SAST_DEFAULT_ANALYZERS: "bandit, gosec" + SAST_DEFAULT_ANALYZERS: "bandit, brakeman" + SAST_EXCLUDED_ANALYZERS: "brakeman" stages: - our_custom_security_stage diff --git a/spec/support/gitlab_stubs/gitlab_ci_for_sast_default_analyzers.yml b/spec/support/gitlab_stubs/gitlab_ci_for_sast_default_analyzers.yml new file mode 100644 index 00000000000..c4f3c3aace2 --- /dev/null +++ b/spec/support/gitlab_stubs/gitlab_ci_for_sast_default_analyzers.yml @@ -0,0 +1,15 @@ +include: + - template: SAST.gitlab-ci.yml + +variables: + SECURE_ANALYZERS_PREFIX: "registry.gitlab.com/gitlab-org/security-products/analyzers2" + SAST_EXCLUDED_PATHS: "spec, executables" + SAST_DEFAULT_ANALYZERS: "bandit, gosec" + +stages: + - our_custom_security_stage +sast: + stage: our_custom_security_stage + variables: + SEARCH_MAX_DEPTH: 8 + SAST_BRAKEMAN_LEVEL: 2 diff --git a/spec/support/gitlab_stubs/gitlab_ci_for_sast_excluded_analyzers.yml b/spec/support/gitlab_stubs/gitlab_ci_for_sast_excluded_analyzers.yml new file mode 100644 index 00000000000..b665de5f982 --- /dev/null +++ b/spec/support/gitlab_stubs/gitlab_ci_for_sast_excluded_analyzers.yml @@ -0,0 +1,14 @@ +include: + - template: SAST.gitlab-ci.yml + +variables: + SECURE_ANALYZERS_PREFIX: "registry.gitlab.com/gitlab-org/security-products/analyzers2" + SAST_EXCLUDED_PATHS: "spec, executables" + SAST_EXCLUDED_ANALYZERS: "brakeman" + +stages: + - our_custom_security_stage +sast: + stage: our_custom_security_stage + variables: + SEARCH_MAX_DEPTH: 8 diff --git a/spec/support/gitlab_stubs/gitlab_ci_includes.yml b/spec/support/gitlab_stubs/gitlab_ci_includes.yml index e74773ce23e..1029fa1ea86 100644 --- a/spec/support/gitlab_stubs/gitlab_ci_includes.yml +++ b/spec/support/gitlab_stubs/gitlab_ci_includes.yml @@ -1,19 +1,45 @@ +before_script: + - bundle install + - bundle exec rake db:create + rspec 0 1: stage: build script: 'rake spec' needs: [] + tags: + - ruby + - postgres + only: + - branches + - master rspec 0 2: stage: build + allow_failure: true script: 'rake spec' + when: on_failure needs: [] spinach: stage: build script: 'rake spinach' needs: [] + except: + - tags +deploy_job: + stage: deploy + script: + - echo 'done' + environment: + name: production docker: stage: test script: 'curl http://dockerhub/URL' needs: [spinach, rspec 0 1] + when: manual + except: + - branches + +after_script: + - echo 'run this after' |