Commit 4b27106e authored by Rémy Coutable's avatar Rémy Coutable

Introduce a new 'qa:selectors-foss' job

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent d8b78f24
...@@ -188,29 +188,6 @@ jest-foss: ...@@ -188,29 +188,6 @@ jest-foss:
cache: cache:
policy: pull policy: pull
.qa-job-base:
extends:
- .default-tags
- .default-retry
- .default-cache
- .default-only
- .only-code-qa-changes
dependencies: []
stage: test
before_script:
- cd qa/
- bundle install
qa:internal:
extends: .qa-job-base
script:
- bundle exec rspec
qa:selectors:
extends: .qa-job-base
script:
- bundle exec bin/qa Test::Sanity::Selectors
.qa-frontend-node: .qa-frontend-node:
extends: extends:
- .default-tags - .default-tags
......
.qa-job-base:
extends:
- .default-tags
- .default-retry
- .default-only
- .only-code-qa-changes
stage: test
dependencies: []
# It's currently impossible to specify `needs: []` so we depend on `build-qa-image` which also has `.only-code-qa-changes`
needs: ["build-qa-image"]
cache:
key: "qa-framework-jobs:v1"
paths:
- vendor/ruby
before_script:
- cd qa/
- bundle install --clean --jobs=$(nproc) --path=vendor --retry=3 --quiet
- bundle check
qa:internal:
extends: .qa-job-base
script:
- bundle exec rspec
qa:selectors:
extends: .qa-job-base
script:
- bundle exec bin/qa Test::Sanity::Selectors
qa:selectors-foss:
extends:
- qa:selectors
- .only-ee-as-if-foss
.package-and-qa-base: .package-and-qa-base:
extends: .default-only extends: .default-only
image: ruby:2.6-alpine image: ruby:2.6-alpine
......
...@@ -62,7 +62,6 @@ each pipeline includes the following [variables](../ci/variables/README.md): ...@@ -62,7 +62,6 @@ each pipeline includes the following [variables](../ci/variables/README.md):
- `GIT_SUBMODULE_STRATEGY: "none"` - `GIT_SUBMODULE_STRATEGY: "none"`
- `GET_SOURCES_ATTEMPTS: "3"` - `GET_SOURCES_ATTEMPTS: "3"`
- `KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json` - `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` - `FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json`
- `BUILD_ASSETS_IMAGE: "false"` - `BUILD_ASSETS_IMAGE: "false"`
- `ES_JAVA_OPTS: "-Xms256m -Xmx256m"` - `ES_JAVA_OPTS: "-Xms256m -Xmx256m"`
...@@ -93,9 +92,17 @@ These common definitions are: ...@@ -93,9 +92,17 @@ These common definitions are:
for `master` and auto-deploy branches. for `master` and auto-deploy branches.
- `.only-review-schedules`: Same as `.only-review` but also restrict a job to - `.only-review-schedules`: Same as `.only-review` but also restrict a job to
only run for [schedules](../user/project/pipelines/schedules.md). 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. - `.only-canonical-schedules`: Only creates a job for scheduled pipelines in
- `.use-pg-10`: Allows a job to use the `postgres:10.9` and `redis:alpine` services. 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`: 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 ## Changes detection
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment