diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 03:10:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 03:10:15 +0300 |
| commit | 46aea02972d6caaf34a11689e9e6ccfa9dcb538a (patch) | |
| tree | 5e4e71724bdab97d6d3f57ed25e11e0c516383fb /doc/development/pipelines.md | |
| parent | 83d921d51bd5bf8bd0ecd078706d7c037fb711cb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/pipelines.md')
| -rw-r--r-- | doc/development/pipelines.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md index c3fb66cb085..0dc1481f542 100644 --- a/doc/development/pipelines.md +++ b/doc/development/pipelines.md @@ -24,7 +24,7 @@ feature of the GitLab CI/CD. Pipelines are always created for the following scenarios: -- `master` branch, including on schedules, pushes, merges, and so on. +- `main` branch, including on schedules, pushes, merges, and so on. - Merge requests. - Tags. - Stable, `auto-deploy`, and security branches. @@ -428,7 +428,7 @@ We are using a custom mapping between source file to test files, maintained in t As part of the objective to improve overall pipeline duration, we are experimenting with a minimal set of RSpec tests. The purpose of this experiment is to verify if we are able to run a minimal set of RSpec tests in a Merge Request pipeline, -without resulting in increased number of broken master. +without resulting in increased number of broken main branch. To identify the minimal set of tests needed, we use [Crystalball gem](https://github.com/toptal/crystalball) to create a test mapping. The test mapping contains a map of each source files to a list of test files which is dependent of the source file. @@ -484,14 +484,14 @@ Our test suite runs against PG12 as GitLab.com runs on PG12 and Our test suite is currently running against PG11, since GitLab.com still runs on PG11. We do run our test suite against PG11 on nightly scheduled pipelines as well as upon specific -database library changes in MRs and `master` pipelines (with the `rspec db-library-code pg11` job). +database library changes in MRs and `main` pipelines (with the `rspec db-library-code pg11` job). #### Current versions testing | Where? | PostgreSQL version | | ------ | ------------------ | | MRs | 12, 11 for DB library changes | -| `master` (non-scheduled pipelines) | 12, 11 for DB library changes | +| `main` (non-scheduled pipelines) | 12, 11 for DB library changes | | 2-hourly scheduled pipelines | 12, 11 for DB library changes | | `nightly` scheduled pipelines | 12, 11 | @@ -538,7 +538,7 @@ the `gitlab-org/gitlab-foss` project. ### Interruptible pipelines By default, all jobs are [interruptible](../ci/yaml/README.md#interruptible), except the -`dont-interrupt-me` job which runs automatically on `master`, and is `manual` +`dont-interrupt-me` job which runs automatically on `main`, and is `manual` otherwise. If you want a running pipeline to finish even if you push new commits to a merge |