Commit 95c3a927 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Use knapsack 1.11.0

parent 432b9664
...@@ -22,27 +22,27 @@ before_script: ...@@ -22,27 +22,27 @@ before_script:
- cp config/gitlab.yml.example config/gitlab.yml - cp config/gitlab.yml.example config/gitlab.yml
- bundle --version - bundle --version
- retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}" - 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' - '[ "$USE_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate'
stages: stages:
- build - prepare
- test - test
- notifications - notifications
prepare: prepare:
stage: build stage: prepare
variables: variables:
USE_DB: "false" USE_DB: "false"
script: script:
- bundle exec rake assets:precompile - bundle exec rake assets:precompile
- echo "{}" > knapsack_rspec_report.json - mkdir knapsack/
- echo "{}" > knapsack_spinach_report.json - echo "{}" > knapsack/rspec_report.json
- echo "{}" > knapsack/spinach_report.json
artifacts: artifacts:
paths: paths:
- public/assets/ - public/assets/
- knapsack_rspec_report.json - knapsack/
- knapsack_spinach_report.json
.knapsack: &knapsack .knapsack: &knapsack
stage: test stage: test
...@@ -50,7 +50,12 @@ prepare: ...@@ -50,7 +50,12 @@ prepare:
- JOB_NAME=( $CI_BUILD_NAME ) - JOB_NAME=( $CI_BUILD_NAME )
- export CI_NODE_INDEX=${JOB_NAME[1]} - export CI_NODE_INDEX=${JOB_NAME[1]}
- export CI_NODE_TOTAL=${JOB_NAME[2]} - 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 .exec: &exec
stage: test stage: test
......
...@@ -313,7 +313,7 @@ group :test do ...@@ -313,7 +313,7 @@ group :test do
gem 'webmock', '~> 1.21.0' gem 'webmock', '~> 1.21.0'
gem 'test_after_commit', '~> 0.4.2' gem 'test_after_commit', '~> 0.4.2'
gem 'sham_rack' gem 'sham_rack'
gem 'knapsack-gitlab' gem 'knapsack'
end end
group :production do group :production do
......
...@@ -358,7 +358,7 @@ GEM ...@@ -358,7 +358,7 @@ GEM
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
kgio (2.10.0) kgio (2.10.0)
knapsack-gitlab (1.9.2) knapsack (1.11.0)
rake rake
timecop (>= 0.1.0) timecop (>= 0.1.0)
launchy (2.4.3) launchy (2.4.3)
...@@ -878,7 +878,7 @@ DEPENDENCIES ...@@ -878,7 +878,7 @@ DEPENDENCIES
jquery-ui-rails (~> 5.0.0) jquery-ui-rails (~> 5.0.0)
jwt jwt
kaminari (~> 0.17.0) kaminari (~> 0.17.0)
knapsack-gitlab knapsack
letter_opener_web (~> 1.3.0) letter_opener_web (~> 1.3.0)
licensee (~> 8.0.0) licensee (~> 8.0.0)
loofah (~> 2.0.3) loofah (~> 2.0.3)
......
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