Skip to content

Commit 3b560dd

Browse files
committed
Remove outdated ci_setup.md doc page and document MySQL and RSpec profiling for specific branches
Signed-off-by: Rémy Coutable <[email protected]>
1 parent 6dc424c commit 3b560dd

File tree

4 files changed

+13
-52
lines changed

4 files changed

+13
-52
lines changed

.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ stages:
5959

6060
.only-master-and-ee-or-mysql: &only-master-and-ee-or-mysql
6161
only:
62-
- /\-(?i)mysql$/
62+
- /mysql/
6363
- master@gitlab-org/gitlab-ce
6464
- master@gitlab/gitlabhq
6565
- tags@gitlab-org/gitlab-ce

doc/development/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
## Backend howtos
3434

3535
- [Architecture](architecture.md) of GitLab
36-
- [CI setup](ci_setup.md) for testing GitLab
3736
- [Gotchas](gotchas.md) to avoid
3837
- [How to dump production data to staging](db_dump.md)
3938
- [Instrumentation](instrumentation.md)

doc/development/ci_setup.md

-47
This file was deleted.

doc/development/testing.md

+12-3
Original file line numberDiff line numberDiff line change
@@ -448,13 +448,22 @@ is used for Spinach tests as well.
448448

449449
### Monitoring
450450

451-
The GitLab test suite is [monitored] and a [public dashboard] is available for
452-
everyone to see. Feel free to look at the slowest test files and try to improve
453-
them.
451+
The GitLab test suite is [monitored] for the `master` branch, and any branch
452+
that includes `rspec-profile` in their name.
453+
454+
A [public dashboard] is available for everyone to see. Feel free to look at the
455+
slowest test files and try to improve them.
454456

455457
[monitored]: ./performance.md#rspec-profiling
456458
[public dashboard]: https://redash.gitlab.com/public/dashboards/l1WhHXaxrCWM5Ai9D7YDqHKehq6OU3bx5gssaiWe?org_slug=default
457459

460+
## CI setup
461+
462+
- On CE, the test suite only runs against PostgreSQL by default. We additionally
463+
run the suite against MySQL for tags, `master`, and any branch that includes
464+
`mysql` in the name.
465+
- On EE, the test suite always runs both PostgreSQL and MySQL.
466+
458467
## Spinach (feature) tests
459468

460469
GitLab [moved from Cucumber to Spinach](https://github.com/gitlabhq/gitlabhq/pull/1426)

0 commit comments

Comments
 (0)