diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-10-21 00:52:38 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-10-21 00:52:38 -0700 |
| commit | 80c376ee21f43249d4d7650b1e63248eea18fe84 (patch) | |
| tree | 4bdd25de875a65d01da9a7405754753ab7d4f490 | |
| parent | b91c7053e435f371a2e93b3af272489924ce463c (diff) | |
| download | gitlab-ce-sh-test-spinach.tar.gz | |
Testing: Don't warm asset cache in CI modesh-test-spinach
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | features/support/capybara.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e5298cfe07..d79b6c78251 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,7 +103,7 @@ update-knapsack: - which spinach - ls /builds/gitlab-org/gitlab-ce/vendor/ruby/2.3.0/bin - bundle exec spinach --help - - echo knapsack spinach "-r rerun" || retry '[[ -e tmp/spinach-rerun.txt ]] && bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)' + - knapsack spinach "-r rerun" || retry '[[ -e tmp/spinach-rerun.txt ]] && bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)' artifacts: expire_in: 31d paths: diff --git a/features/support/capybara.rb b/features/support/capybara.rb index 05f272c38e2..dae0d0f918c 100644 --- a/features/support/capybara.rb +++ b/features/support/capybara.rb @@ -1,6 +1,5 @@ require 'spinach/capybara' require 'capybara/poltergeist' -require 'capybara/rails' # Give CI some extra time timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 90 : 15 @@ -21,5 +20,5 @@ unless ENV['CI'] || ENV['CI_SERVER'] end Spinach.hooks.before_run do - TestEnv.warm_asset_cache + TestEnv.warm_asset_cache unless ENV['CI'] || ENV['CI_SERVER'] end |