diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 18:06:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 18:06:00 +0000 |
| commit | 7c862041c66833ebf49d9964f1797d93b1829690 (patch) | |
| tree | 684a6603c6913e2c59c9bc7147d825ef35fc1b63 /doc/development | |
| parent | d96abbee0b394ac40eb67253214fb9c41a31bd41 (diff) | |
| download | gitlab-ce-7c862041c66833ebf49d9964f1797d93b1829690.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development')
| -rw-r--r-- | doc/development/pipelines.md | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md index 9d065406c90..5ec68ef3251 100644 --- a/doc/development/pipelines.md +++ b/doc/development/pipelines.md @@ -62,7 +62,6 @@ each pipeline includes the following [variables](../ci/variables/README.md): - `GIT_SUBMODULE_STRATEGY: "none"` - `GET_SOURCES_ATTEMPTS: "3"` - `KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json` -- `EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master-ee.json` - `FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json` - `BUILD_ASSETS_IMAGE: "false"` - `ES_JAVA_OPTS: "-Xms256m -Xmx256m"` @@ -93,9 +92,17 @@ These common definitions are: for `master` and auto-deploy branches. - `.only-review-schedules`: Same as `.only-review` but also restrict a job to only run for [schedules](../user/project/pipelines/schedules.md). -- `.use-pg`: Allows a job to use the `postgres:9.6.14` and `redis:alpine` services. -- `.use-pg-10`: Allows a job to use the `postgres:10.9` and `redis:alpine` services. +- `.only-canonical-schedules`: Only creates a job for scheduled pipelines in + the `gitlab-org/gitlab` and `gitlab-org/gitlab-foss` projects +- `.use-pg9`: Allows a job to use the `postgres:9.6` and `redis:alpine` services. +- `.use-pg10`: Allows a job to use the `postgres:10.9` and `redis:alpine` services. +- `.use-pg9-ee`: Same as `.use-pg9` but also use the + `docker.elastic.co/elasticsearch/elasticsearch:5.6.12` services. +- `.use-pg10-ee`: Same as `.use-pg10` but also use the + `docker.elastic.co/elasticsearch/elasticsearch:5.6.12` services. - `.only-ee`: Only creates a job for the `gitlab` project. +- `.only-ee-as-if-foss`: Same as `.only-ee` but simulate the FOSS project by + setting the `IS_GITLAB_EE='0'` environment variable. ## Changes detection |