summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml21
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
3 files changed, 16 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0bce69cf5a..cf85820abdf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,27 +22,27 @@ before_script:
- cp config/gitlab.yml.example config/gitlab.yml
- bundle --version
- retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
- - retry gem install knapsack-gitlab
+ - retry gem install knapsack
- '[ "$USE_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate'
stages:
-- build
+- prepare
- test
- notifications
prepare:
- stage: build
+ stage: prepare
variables:
USE_DB: "false"
script:
- bundle exec rake assets:precompile
- - echo "{}" > knapsack_rspec_report.json
- - echo "{}" > knapsack_spinach_report.json
+ - mkdir knapsack/
+ - echo "{}" > knapsack/rspec_report.json
+ - echo "{}" > knapsack/spinach_report.json
artifacts:
paths:
- public/assets/
- - knapsack_rspec_report.json
- - knapsack_spinach_report.json
+ - knapsack/
.knapsack: &knapsack
stage: test
@@ -50,7 +50,12 @@ prepare:
- JOB_NAME=( $CI_BUILD_NAME )
- export CI_NODE_INDEX=${JOB_NAME[1]}
- export CI_NODE_TOTAL=${JOB_NAME[2]}
- - knapsack-gitlab ${JOB_NAME[0]}
+ - export KNAPSACK_REPORT_PATH=knapsack/${JOB_NAME}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
+ - cp knapsack/${JOB_NAME}_report.json ${KNAPSACK_REPORT_PATH}
+ - knapsack ${JOB_NAME[0]}
+ artifacts:
+ paths:
+ - knapsack/
.exec: &exec
stage: test
diff --git a/Gemfile b/Gemfile
index f4602008ecf..b9ae1aecb50 100644
--- a/Gemfile
+++ b/Gemfile
@@ -313,7 +313,7 @@ group :test do
gem 'webmock', '~> 1.21.0'
gem 'test_after_commit', '~> 0.4.2'
gem 'sham_rack'
- gem 'knapsack-gitlab'
+ gem 'knapsack'
end
group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 0f75c231d4e..8bfdf8ea9bd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -358,7 +358,7 @@ GEM
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.10.0)
- knapsack-gitlab (1.9.2)
+ knapsack (1.11.0)
rake
timecop (>= 0.1.0)
launchy (2.4.3)
@@ -878,7 +878,7 @@ DEPENDENCIES
jquery-ui-rails (~> 5.0.0)
jwt
kaminari (~> 0.17.0)
- knapsack-gitlab
+ knapsack
letter_opener_web (~> 1.3.0)
licensee (~> 8.0.0)
loofah (~> 2.0.3)