Skip to content

Commit fcf8b99

Browse files
Jon Glassmaneread
andcommitted
Merge branch 'eread/remove-trailing-whitespace-from-docs' into 'master'
Remove trailing whitespace from documentation See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7138 Merged-by: Jon Glassman <[email protected]> Approved-by: Jon Glassman <[email protected]> Co-authored-by: Evan Read <[email protected]>
2 parents 6881a23 + 86a44b4 commit fcf8b99

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

doc/development/allure-test-report.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ To get an allure report snapshot as a comment in the MR, following environment v
4040

4141
### qa-remaining-test-manual
4242

43-
The `qa-remaining-test-manual` job is a manual trigger pipeline. It triggers the same pipeline as `qa-subset-test` but runs the tests which aren't run as a part of `qa-subset-test` job.
43+
The `qa-remaining-test-manual` job is a manual trigger pipeline. It triggers the same pipeline as `qa-subset-test` but runs the tests which aren't run as a part of `qa-subset-test` job.
4444

45-
The environment variables used in `qa-subset-test` are the same that are used in this job to generate the allure report.
45+
The environment variables used in `qa-subset-test` are the same that are used in this job to generate the allure report.
4646

4747
## QA-SUBSET-TEST child pipeline
4848

49-
This pipeline runs a subset of all the orchestrated tests using GitLab QA project which in turn uses allure gem to generate report source files for each test that is executed and stores the files in a common folder. Certain orchestrated jobs like `instance`, `decomposition-single-db`, `decomposition-multiple-db` and `praefect` run only smoke and reliable tests which intially used to run the entire suite.
49+
This pipeline runs a subset of all the orchestrated tests using GitLab QA project which in turn uses allure gem to generate report source files for each test that is executed and stores the files in a common folder. Certain orchestrated jobs like `instance`, `decomposition-single-db`, `decomposition-multiple-db` and `praefect` run only smoke and reliable tests which intially used to run the entire suite.
5050

5151
### e2e-test-report job
5252

doc/development/pipelines.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,15 +296,15 @@ This job triggers a pipeline in the [GitLab QA Mirror](https://gitlab.com/gitlab
296296

297297
This job is run only on [QA mirror](https://gitlab.com/gitlab-org/build/omnibus-gitlab-mirror) on triggered pipelines.
298298

299-
### `qa-remaining-test-manual`
299+
### `qa-remaining-test-manual`
300300

301301
This is a manual trigger job which runs the remaining tests that donot run in the `qa-subset-test` job.
302302

303303
To run this QA jobs in MR pipeline, you need to either trigger `Trigger:CE-package` or `Trigger:EE-package` manual jobs.
304304

305305
This job triggers a pipeline in the [GitLab QA Mirror](https://gitlab.com/gitlab-org/gitlab-qa-mirror), passing the GitLab
306306
Docker image created by `Trigger:gitlab-docker` job and the GitLab QA Docker
307-
image built by the GitLab Rails pipeline, so that the entire suite is run using these images.
307+
image built by the GitLab Rails pipeline, so that the entire suite is run using these images.
308308

309309
#### `RAT`
310310

doc/settings/database.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ throw errors about the data directory being initialized on a different version o
961961
see [Revert packaged PostgreSQL server to the previous version](#revert-packaged-postgresql-server-to-the-previous-version).
962962
963963
If you are doing a fresh install on an environment that previously had GitLab installed on it and you are using a pinned PostgreSQL version, first make
964-
sure that any folders that relate to PostgreSQL are deleted and that there are no PostgreSQL processes running on the instance.
964+
sure that any folders that relate to PostgreSQL are deleted and that there are no PostgreSQL processes running on the instance.
965965
966966
### Troubleshooting
967967

0 commit comments

Comments
 (0)