diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-15 18:10:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-15 18:10:04 +0300 |
| commit | 68d7192881c41305da9c6aa1e3f7dd8b47f286a7 (patch) | |
| tree | 015aae6f32b30437718e76c663e8383a4a4d8a22 /doc/ci/migration | |
| parent | 96acc69fae1ee7d559ba7eaa4e8304c8261525e3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/migration')
| -rw-r--r-- | doc/ci/migration/jenkins.md | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/ci/migration/jenkins.md b/doc/ci/migration/jenkins.md index 9d3aab4872a..812f1caa5d1 100644 --- a/doc/ci/migration/jenkins.md +++ b/doc/ci/migration/jenkins.md @@ -349,12 +349,14 @@ variable entry. GitLab does support a [`when` keyword](../yaml/README.md#when) which is used to indicate when a job should be run in case of (or despite) failure, but most of the logic for controlling pipelines can be found in -our very powerful [`only/except` rules system](../yaml/README.md#only--except) -(see also our [advanced syntax](../yaml/README.md#only--except)): +our very powerful [`rules` system](../yaml/README.md#rules): ```yaml my_job: - only: [branches] + script: + - echo + rules: + - if: $CI_COMMIT_BRANCH ``` ## Additional resources |