diff options
| author | John Keiser <john@johnkeiser.com> | 2016-01-28 16:10:42 -0800 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-01-28 16:25:35 -0800 |
| commit | 1b4bae95b0230a2105253aeacff2e701a9f11f08 (patch) | |
| tree | a2c516f9ad55a4a59c65310a01fd875a91b9eaf3 | |
| parent | 934ffef0432b0245691b08487a7a5f094c90dc6f (diff) | |
| download | chef-zero-1b4bae95b0230a2105253aeacff2e701a9f11f08.tar.gz | |
Run chef-zero against master chef on travis
| -rw-r--r-- | .travis.yml | 18 | ||||
| -rw-r--r-- | Gemfile | 9 | ||||
| -rw-r--r-- | Rakefile | 1 | ||||
| -rw-r--r-- | chef-zero.gemspec | 1 | ||||
| -rw-r--r-- | spec/run_oc_pedant.rb | 4 |
5 files changed, 24 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index f701ef4..a0c6cb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,9 @@ branches: sudo: false -script: bundle exec rake pedant +script: + - bundle update + - bundle exec rake pedant matrix: include: @@ -21,6 +23,10 @@ matrix: - rvm: 2.1 env: CHEF_FS=true - rvm: 2.1 + env: + - CHEF_FS=true + - "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\"" + - rvm: 2.1 env: FILE_STORE=true - rvm: 2.1 script: bundle exec rake chef_spec @@ -29,11 +35,11 @@ matrix: script: bundle exec rake spec env: TEST=rake_spec - allow_failures: - - rvm: 2.1 - gemfile: gemfiles/latest-chef.gemfile - script: bundle exec rake chef_spec - enc: TEST=chef_spec_latest +# allow_failures: +# - rvm: 2.1 +# gemfile: gemfiles/latest-chef.gemfile +# script: bundle exec rake chef_spec +# enc: TEST=chef_spec_latest # - rvm: 2.1.1 # gemfile: gemfiles/berkshelf.gemfile # script: bundle exec rake berkshelf_spec @@ -1,11 +1,16 @@ source 'https://rubygems.org' gemspec -gem 'rest-client', :github => 'chef/rest-client' +# gem 'rest-client', :github => 'chef/rest-client' gem 'oc-chef-pedant', :github => 'chef/chef-server', :branch => "jk/authorization-tags" # bundler resolve failure on "rspec_junit_formatter" # gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => "server-cli-option" -gem 'chef', :github => 'chef/chef', :branch => 'jk/policies-acls' +# gem 'chef', :github => 'chef/chef', :branch => 'jk/policies-acls' + +if ENV['GEMFILE_MOD'] + puts "GEMFILE_MOD: #{ENV['GEMFILE_MOD']}" + instance_eval(ENV['GEMFILE_MOD']) +end @@ -45,7 +45,6 @@ end require 'github_changelog_generator/task' GitHubChangelogGenerator::RakeTask.new :changelog do |config| - config.token = ENV['GITHUB_CHANGELOG_TOKEN'] # config.future_release = ChefZero::VERSION config.enhancement_labels = "enhancement,Enhancement,New Feature".split(',') config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(',') diff --git a/chef-zero.gemspec b/chef-zero.gemspec index f7baf0a..d512955 100644 --- a/chef-zero.gemspec +++ b/chef-zero.gemspec @@ -24,6 +24,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'rake' s.add_development_dependency 'rspec' s.add_development_dependency 'github_changelog_generator' + s.add_development_dependency 'chef' s.bindir = 'bin' s.executables = ['chef-zero'] diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb index 47d878b..92ef136 100644 --- a/spec/run_oc_pedant.rb +++ b/spec/run_oc_pedant.rb @@ -93,6 +93,10 @@ begin else [] end + # The latest released Chef doesn't do ACLs, Cookbook Artifacts or Policies yet + chef_fs_skips << '--skip-acl' + chef_fs_skips << '--skip-cookbook-artifacts' + chef_fs_skips << '--skip-policies' # These things aren't supported by Chef Zero in any mode of operation: default_skips = [ |