diff options
Diffstat (limited to 'doc/development/pipelines.md')
| -rw-r--r-- | doc/development/pipelines.md | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md index d516a808afd..32c89c28815 100644 --- a/doc/development/pipelines.md +++ b/doc/development/pipelines.md @@ -156,7 +156,7 @@ This is similar to the `.only:variables-canonical-dot-com` + `.except:refs-maste CI definitions: ```yaml -.if-canonical-gitlab-and-merge-request: &if-canonical-gitlab-and-merge-request +.if-canonical-gitlab-merge-request: &if-canonical-gitlab-merge-request if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_MERGE_REQUEST_IID' ``` @@ -210,9 +210,7 @@ graph RL; M[coverage]; N[pages]; O[static-analysis]; - P["schedule:package-and-qa<br/>(master schedule only)"]; Q[package-and-qa]; - R[package-and-qa-manual]; S["RSpec<br/>(e.g. rspec unit pg9)"] T[retrieve-tests-metadata]; @@ -259,10 +257,6 @@ subgraph "`review` stage" subgraph "`qa` stage" Q --> |needs| C; Q --> |needs| F; - R --> |needs| C; - R --> |needs| F; - P --> |needs| C; - P --> |needs| F; review-qa-smoke -.-> |needs and depends on| G; review-qa-all -.-> |needs and depends on| G; review-performance -.-> |needs and depends on| G; @@ -271,8 +265,7 @@ subgraph "`qa` stage" end subgraph "`notification` stage" - NOTIFICATION1["schedule:package-and-qa:notify-success<br>(on_success)"] -.-> |needs| P; - NOTIFICATION2["schedule:package-and-qa:notify-failure<br>(on_failure)"] -.-> |needs| P; + NOTIFICATION2["package-and-qa:notify-failure<br>(manual)"] -.-> |needs| Q; end subgraph "`post-test` stage" |