Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c5df841e
Commit
c5df841e
authored
Jun 15, 2021
by
Marcel Amirault
Committed by
Suzanne Selhorn
Jun 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revamp rules docs to new style
parent
5ed9327a
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
363 additions
and
385 deletions
+363
-385
doc/ci/jobs/job_control.md
doc/ci/jobs/job_control.md
+271
-0
doc/ci/merge_request_pipelines/index.md
doc/ci/merge_request_pipelines/index.md
+1
-1
doc/ci/troubleshooting.md
doc/ci/troubleshooting.md
+3
-3
doc/ci/yaml/README.md
doc/ci/yaml/README.md
+87
-380
doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
...er/project/merge_requests/merge_when_pipeline_succeeds.md
+1
-1
No files found.
doc/ci/jobs/job_control.md
View file @
c5df841e
This diff is collapsed.
Click to expand it.
doc/ci/merge_request_pipelines/index.md
View file @
c5df841e
...
@@ -219,7 +219,7 @@ The variable names begin with the `CI_MERGE_REQUEST_` prefix.
...
@@ -219,7 +219,7 @@ The variable names begin with the `CI_MERGE_REQUEST_` prefix.
### Two pipelines created when pushing to a merge request
### Two pipelines created when pushing to a merge request
If you are experiencing duplicated pipelines when using
`rules`
, take a look at
If you are experiencing duplicated pipelines when using
`rules`
, take a look at
the
[
important differences between `rules` and `only`/`except`
](
../
yaml/README
.md#avoid-duplicate-pipelines
)
,
the
[
important differences between `rules` and `only`/`except`
](
../
jobs/job_control
.md#avoid-duplicate-pipelines
)
,
which helps you get your starting configuration correct.
which helps you get your starting configuration correct.
If you are seeing two pipelines when using
`only/except`
, please see the caveats
If you are seeing two pipelines when using
`only/except`
, please see the caveats
...
...
doc/ci/troubleshooting.md
View file @
c5df841e
...
@@ -109,7 +109,7 @@ the [`rules` configuration details](yaml/README.md#rules) carefully. The behavio
...
@@ -109,7 +109,7 @@ the [`rules` configuration details](yaml/README.md#rules) carefully. The behavio
of
`only/except`
and
`rules`
is different and can cause unexpected behavior when migrating
of
`only/except`
and
`rules`
is different and can cause unexpected behavior when migrating
between the two.
between the two.
The
[
common `if` clauses for `rules`
](
yaml/README
.md#common-if-clauses-for-rules
)
The
[
common `if` clauses for `rules`
](
jobs/job_control
.md#common-if-clauses-for-rules
)
can be very helpful for examples of how to write rules that behave the way you expect.
can be very helpful for examples of how to write rules that behave the way you expect.
#### Two pipelines run at the same time
#### Two pipelines run at the same time
...
@@ -119,7 +119,7 @@ associated with it. Usually one pipeline is a merge request pipeline, and the ot
...
@@ -119,7 +119,7 @@ associated with it. Usually one pipeline is a merge request pipeline, and the ot
is a branch pipeline.
is a branch pipeline.
This is usually caused by the
`rules`
configuration, and there are several ways to
This is usually caused by the
`rules`
configuration, and there are several ways to
[
prevent duplicate pipelines
](
yaml/README
.md#avoid-duplicate-pipelines
)
.
[
prevent duplicate pipelines
](
jobs/job_control
.md#avoid-duplicate-pipelines
)
.
#### A job is not in the pipeline
#### A job is not in the pipeline
...
@@ -258,7 +258,7 @@ When you use [`rules`](yaml/README.md#rules) with a `when:` clause without an `i
...
@@ -258,7 +258,7 @@ When you use [`rules`](yaml/README.md#rules) with a `when:` clause without an `i
clause, multiple pipelines may run. Usually this occurs when you push a commit to
clause, multiple pipelines may run. Usually this occurs when you push a commit to
a branch that has an open merge request associated with it.
a branch that has an open merge request associated with it.
To
[
prevent duplicate pipelines
](
yaml/README
.md#avoid-duplicate-pipelines
)
, use
To
[
prevent duplicate pipelines
](
jobs/job_control
.md#avoid-duplicate-pipelines
)
, use
[
`workflow: rules`
](
yaml/README.md#workflow
)
or rewrite your rules to control
[
`workflow: rules`
](
yaml/README.md#workflow
)
or rewrite your rules to control
which pipelines can run.
which pipelines can run.
...
...
doc/ci/yaml/README.md
View file @
c5df841e
This diff is collapsed.
Click to expand it.
doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
View file @
c5df841e
...
@@ -94,7 +94,7 @@ merge-request-pipeline-job:
...
@@ -94,7 +94,7 @@ merge-request-pipeline-job:
```
```
You should avoid configuration like this, and only use branch (
`push`
) pipelines
You should avoid configuration like this, and only use branch (
`push`
) pipelines
or merge request pipelines, when possible. See
[
`rules` documentation
](
../../../ci/
yaml/README
.md#avoid-duplicate-pipelines
)
or merge request pipelines, when possible. See
[
`rules` documentation
](
../../../ci/
jobs/job_control
.md#avoid-duplicate-pipelines
)
for details on avoiding two pipelines for a single merge request.
for details on avoiding two pipelines for a single merge request.
### Skipped pipelines
### Skipped pipelines
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment