Commit 3f71afed authored by Robert Speicher's avatar Robert Speicher

Merge branch 'update-ci-config-for-security-project' into 'master'

Modify the CI config to support security branches

See merge request gitlab-org/gitlab!17082
parents 21721ca8 1fb4b4f5
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
- rm -f /etc/apt/sources.list.d/google*.list # We don't need to update Chrome here - rm -f /etc/apt/sources.list.d/google*.list # We don't need to update Chrome here
only: only:
variables: variables:
- $CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" - $CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ # Matches the gitlab-org group and its subgroups
- $CI_SERVER_HOST == "dev.gitlab.org" - $CI_SERVER_HOST == "dev.gitlab.org"
tags: tags:
- gitlab-org - gitlab-org
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
- master - master
- /^[\d-]+-stable(-ee)?$/ - /^[\d-]+-stable(-ee)?$/
- /^\d+-\d+-auto-deploy-\d+$/ - /^\d+-\d+-auto-deploy-\d+$/
- /^security\//
- merge_requests - merge_requests
- tags - tags
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
- ./scripts/trigger-build omnibus - ./scripts/trigger-build omnibus
only: only:
variables: variables:
- $CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" - $CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ # Matches the gitlab-org group or its subgroups
package-and-qa-manual: package-and-qa-manual:
extends: extends:
......
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