diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /doc/development/testing_guide/ci.md | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'doc/development/testing_guide/ci.md')
-rw-r--r-- | doc/development/testing_guide/ci.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/testing_guide/ci.md b/doc/development/testing_guide/ci.md index 7318f767219..e3fccdcee34 100644 --- a/doc/development/testing_guide/ci.md +++ b/doc/development/testing_guide/ci.md @@ -12,7 +12,7 @@ Our current CI parallelization setup is as follows: 1. The `retrieve-tests-metadata` job in the `prepare` stage ensures we have a `knapsack/report-master.json` file: - - The `knapsack/report-master.json` file is fetched from the latest `master` pipeline which runs `update-tests-metadata` + - The `knapsack/report-master.json` file is fetched from the latest `main` pipeline which runs `update-tests-metadata` (for now it's the 2-hourly scheduled master pipeline), if it's not here we initialize the file with `{}`. 1. Each `[rspec|rspec-ee] [unit|integration|system|geo] n m` job are run with `knapsack rspec` and should have an evenly distributed share of tests: @@ -31,7 +31,7 @@ After that, the next pipeline uses the up-to-date `knapsack/report-master.json` ## Monitoring -The GitLab test suite is [monitored](../performance.md#rspec-profiling) for the `master` branch, and any branch +The GitLab test suite is [monitored](../performance.md#rspec-profiling) for the `main` branch, and any branch that includes `rspec-profile` in their name. ## CI setup |