diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-05-22 11:45:46 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-05-22 11:45:46 +0000 |
| commit | 4f20c9de6f8e09131d751174243214d9bd3b6419 (patch) | |
| tree | b41332bd3773178776ff92738de8cff3f84fc689 /.gitlab/ci/rails.gitlab-ci.yml | |
| parent | c4d930e5f54e7da07c80cc028dfc0f5c08719146 (diff) | |
| download | gitlab-ce-4f20c9de6f8e09131d751174243214d9bd3b6419.tar.gz | |
Revert "Merge branch 'reorganize-tests-jobs-by-level' into 'master'"revert-04c3c6dd
This reverts merge request !27514
Diffstat (limited to '.gitlab/ci/rails.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 58 |
1 files changed, 12 insertions, 46 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 346fa47cbb5..29534e40a14 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -6,9 +6,8 @@ .use-pg-10: &use-pg-10 services: - - name: postgres:10.7 - command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] - - name: redis:alpine + - postgres:10.7 + - redis:alpine .use-mysql: &use-mysql services: @@ -53,10 +52,8 @@ script: - JOB_NAME=( $CI_JOB_NAME ) - TEST_TOOL=${JOB_NAME[0]} - - TEST_LEVEL=${JOB_NAME[1]} - - DATABASE=${JOB_NAME[2]} - - export KNAPSACK_REPORT_PATH=knapsack/${CI_PROJECT_NAME}/${TEST_TOOL}_${TEST_LEVEL}_${DATABASE}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json - - export KNAPSACK_GENERATE_REPORT=true KNAPSACK_LOG_LEVEL=debug KNAPSACK_TEST_DIR=spec + - export KNAPSACK_REPORT_PATH=knapsack/${CI_PROJECT_NAME}/${TEST_TOOL}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json + - export KNAPSACK_GENERATE_REPORT=true - export SUITE_FLAKY_RSPEC_REPORT_PATH=${FLAKY_RSPEC_SUITE_REPORT_PATH} - export FLAKY_RSPEC_REPORT_PATH=rspec_flaky/all_${TEST_TOOL}_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json - export NEW_FLAKY_RSPEC_REPORT_PATH=rspec_flaky/new_${TEST_TOOL}_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json @@ -66,10 +63,7 @@ - '[[ -f $FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${FLAKY_RSPEC_REPORT_PATH}' - '[[ -f $NEW_FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${NEW_FLAKY_RSPEC_REPORT_PATH}' - scripts/gitaly-test-spawn - - date - - 'export KNAPSACK_TEST_FILE_PATTERN=$(ruby -r./lib/quality/test_level.rb -e "puts Quality::TestLevel.new.pattern(:${TEST_LEVEL})")' - - knapsack rspec "--color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag level:${TEST_LEVEL} --tag ~geo" - - date + - knapsack rspec "--color --format documentation --format RspecJunitFormatter --out junit_rspec.xml" artifacts: expire_in: 31d when: always @@ -146,47 +140,19 @@ setup-test-env: except: - /(^docs[\/-].*|.*-docs$)/ -rspec unit pg: +rspec-pg: <<: *rspec-metadata-pg - parallel: 20 + parallel: 50 -rspec integration pg: - <<: *rspec-metadata-pg - parallel: 6 - -rspec system pg: - <<: *rspec-metadata-pg - parallel: 24 - -rspec unit pg-10: +rspec-pg-10: <<: *rspec-metadata-pg-10 <<: *only-schedules-master - parallel: 20 - -rspec integration pg-10: - <<: *rspec-metadata-pg-10 - <<: *only-schedules-master - parallel: 6 - -rspec system pg-10: - <<: *rspec-metadata-pg-10 - <<: *only-schedules-master - parallel: 24 - -rspec unit mysql: - <<: *rspec-metadata-mysql - <<: *only-schedules-master - parallel: 20 - -rspec integration mysql: - <<: *rspec-metadata-mysql - <<: *only-schedules-master - parallel: 6 + parallel: 50 -rspec system mysql: +rspec-mysql: <<: *rspec-metadata-mysql <<: *only-schedules-master - parallel: 24 + parallel: 50 rspec-fast-spec-helper: <<: *rspec-metadata-pg @@ -198,7 +164,7 @@ rspec-fast-spec-helper: script: - export CACHE_CLASSES=true - scripts/gitaly-test-spawn - - bin/rspec --color --format documentation --tag quarantine -- spec/ + - bin/rspec --color --format documentation --tag quarantine spec/ rspec-pg-quarantine: <<: *rspec-metadata-pg |