Skip to content
This repository has been archived by the owner on May 25, 2021. It is now read-only.

Commit

Permalink
Try ci-queue
Browse files Browse the repository at this point in the history
  • Loading branch information
schneems committed Aug 15, 2018
1 parent 9e0fbe6 commit fc41d12
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ source "https://rubygems.org"

group :development, :test do
gem "heroku_hatchet"
gem "knapsack"
gem "rspec-core"
gem "rspec-expectations"
gem "excon"
Expand All @@ -12,4 +11,6 @@ group :development, :test do
gem "netrc"
gem "git", github: "hone/ruby-git", branch: "master"
gem 'json', '~> 2.0.2'
gem 'ci-queue'
gem 'redis'
end
9 changes: 6 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
ansi (1.5.0)
ci-queue (0.13.4)
ansi
concurrent-ruby (1.0.5)
diff-lcs (1.3)
erubis (2.7.0)
Expand All @@ -33,8 +36,6 @@ GEM
i18n (1.0.1)
concurrent-ruby (~> 1.0)
json (2.0.4)
knapsack (1.16.0)
rake
minitest (5.11.3)
minitest-retry (0.1.9)
minitest (>= 5.0)
Expand All @@ -48,6 +49,7 @@ GEM
heroics (~> 0.0.23)
moneta (~> 0.8.1)
rake (12.0.0)
redis (4.0.1)
repl_runner (0.0.3)
activesupport
rrrretry (1.0.0)
Expand All @@ -69,14 +71,15 @@ PLATFORMS
ruby

DEPENDENCIES
ci-queue
excon
git!
heroku_hatchet
json (~> 2.0.2)
knapsack
netrc
parallel_tests
rake
redis
rspec-core
rspec-expectations
rspec-retry
Expand Down
3 changes: 0 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
require "fileutils"
require "tmpdir"
require 'hatchet/tasks'
require 'knapsack'
ENV["BUILDPACK_LOG_FILE"] ||= "tmp/buildpack.log"

S3_BUCKET_NAME = "heroku-buildpack-ruby"
Expand Down Expand Up @@ -309,5 +308,3 @@ begin
task :default => :spec
rescue LoadError => e
end

Knapsack.load_tasks if defined?(Knapsack)
5 changes: 4 additions & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"description":"The buildpack for Ruby",
"environments": {
"test": {
"addons":[
"heroku-redis:hobby-dev"
],
"env": {
"HATCHET_RETRIES": "3",
"IS_RUNNING_ON_CI": "true",
Expand All @@ -17,7 +20,7 @@
},
"scripts": {
"test-setup": "bundle exec rake hatchet:setup_ci",
"test": "HATCHET_BUILDPACK_BRANCH=$HEROKU_TEST_RUN_BRANCH bundle exec rake knapsack:rspec"
"test": "HATCHET_BUILDPACK_BRANCH=$HEROKU_TEST_RUN_BRANCH bundle exec rspec-queue --max-requeues=3 --timeout 180 --build $HEROKU_TEST_RUN_ID --worker $CI_NODE_INDEX --queue $REDIS_URL"
},
"buildpacks": [
{ "url": "https://github.com/heroku/heroku-buildpack-apt" },
Expand Down
4 changes: 2 additions & 2 deletions spec/helpers/rake_runner_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
task = rake.task("assets:precompile")
task.invoke

expect(task.status).to eq(:pass)
expect(task.output).to match("success!")
expect(task.status).to eq(:pass)
expect(task.time).not_to be_nil
end
end
Expand All @@ -19,8 +19,8 @@
task = rake.task("assets:precompile")
task.invoke

expect(task.status).to eq(:fail)
expect(task.output).to match("assets:precompile fails")
expect(task.status).to eq(:fail)
expect(task.time).not_to be_nil
end
end
Expand Down
3 changes: 0 additions & 3 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
require 'language_pack'
require 'language_pack/shell_helpers'

require 'knapsack'

Knapsack::Adapters::RSpecAdapter.bind

ENV['RACK_ENV'] = 'test'

Expand Down

0 comments on commit fc41d12

Please sign in to comment.