From d1400a6f2318b4624dbbd9fcda60fd3dbeefc175 Mon Sep 17 00:00:00 2001 From: Jan Klare Date: Wed, 29 Apr 2015 10:29:08 +0200 Subject: [PATCH] move from bundler to chefdk - deprecated Gemfile - updated TESTING and README - updated Rakefile to use chef exec instead of bundle exec - replaced Runner by SoloRunner in specs Change-Id: I2f2bf3e1f193cb43498d0d10da8500ff59a6f5aa --- Gemfile | 4 ++++ README.md | 1 + Rakefile | 21 +++++++-------------- TESTING.md | 16 ++++++++-------- spec/client_spec.rb | 2 +- spec/mariadb-client-redhat_spec.rb | 2 +- spec/mariadb-client-suse_spec.rb | 2 +- spec/mariadb-client_spec.rb | 2 +- spec/mariadb-server-redhat_spec.rb | 2 +- spec/mariadb-server_spec.rb | 2 +- spec/mysql-client-suse_spec.rb | 2 +- spec/mysql-client_spec.rb | 2 +- spec/mysql-server_spec.rb | 2 +- spec/openstack-db_spec.rb | 2 +- spec/postgresql-server_spec.rb | 2 +- spec/server_spec.rb | 2 +- 16 files changed, 32 insertions(+), 34 deletions(-) diff --git a/Gemfile b/Gemfile index 1299374..31c90b5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,7 @@ +## THIS GEMFILE IS DEPRECATED AND WILL BE REMOVED AFTER THE NEXT RELEASE +## THERE WON'T BE ANY UPDATES TO THIS FILE DURING THIS RELEASE CYCLE +## WE SWITCHED TO CHEFDK AS THE BUNDLE FOR THE NEEDED GEMS + source 'https://rubygems.org' gem 'chef', '~> 11.18.6' diff --git a/README.md b/README.md index fea2f27..7349ba9 100644 --- a/README.md +++ b/README.md @@ -119,6 +119,7 @@ License and Author | **Author** | John Dewey () | | **Author** | Ionut Artarisi () | | **Author** | Mark Vanderwiel () | +| **Author** | Jan Klare () | | | | | **Copyright** | Copyright (c) 2012-2013, Rackspace US, Inc. | | **Copyright** | Copyright (c) 2012-2013, Opscode, Inc. | diff --git a/Rakefile b/Rakefile index e9952df..357a6c0 100644 --- a/Rakefile +++ b/Rakefile @@ -2,32 +2,25 @@ task default: ["test"] task :test => [:lint, :style, :unit] -task :bundler_prep do - mkdir_p '.bundle' - sh %{bundle install --path=.bundle --jobs 1 --retry 3 --verbose} +task :berks_prep do + sh %{chef exec berks vendor} end -task :berks_prep => :bundler_prep do - sh %{bundle exec berks vendor} +task :lint do + sh %{chef exec foodcritic --epic-fail any --tags ~FC003 --tags ~FC023 .} end -task :lint => :bundler_prep do - sh %{bundle exec foodcritic --epic-fail any --tags ~FC003 --tags ~FC023 .} -end - -task :style => :bundler_prep do - sh %{bundle exec rubocop} +task :style do + sh %{chef exec rubocop} end task :unit => :berks_prep do - sh %{bundle exec rspec --format documentation} + sh %{chef exec rspec --format documentation} end task :clean do rm_rf [ - '.bundle', 'berks-cookbooks', - 'Gemfile.lock', 'Berksfile.lock' ] end diff --git a/TESTING.md b/TESTING.md index fa2e9c1..d9a964d 100644 --- a/TESTING.md +++ b/TESTING.md @@ -1,18 +1,18 @@ # Testing the Cookbook # -This cookbook uses [bundler](http://gembundler.com/) and [berkshelf](http://berkshelf.com/) to isolate dependencies. Make sure you have `ruby 1.9.x`, `bundler`, `rake`, build essentials and the header files for `gecode` installed before continuing. Make sure that you're using gecode version 3. More info [here](https://github.com/opscode/dep-selector-libgecode/tree/0bad63fea305ede624c58506423ced697dd2545e#using-a-system-gecode-instead). +This cookbook uses [chefdk](https://downloads.chef.io/chef-dk/) and [berkshelf](http://berkshelf.com/) to isolate dependencies. Make sure you have chefdk and the header files for `gecode` installed before continuing. Make sure that you're using gecode version 3. More info [here](https://github.com/opscode/dep-selector-libgecode/tree/0bad63fea305ede624c58506423ced697dd2545e#using-a-system-gecode-instead). For more detailed information on what needs to be installed, you can have a quick look into the bootstrap.sh file in this repository, which does install all the needed things to get going on ubuntu trusty. The tests defined in the Rakefile include lint, style and unit. For integration testing please refere to the [openstack-chef-repo](https://github.com/stackforge/openstack-chef-repo). -We have three test suites which you can run individually (there are three rake tasks): +We have three test suites which you can run either, individually (there are three rake tasks): - $ rake lint - $ rake style - $ rake unit + $ chef exec rake lint + $ chef exec rake style + $ chef exec rake unit or altogether: - $ rake test + $ chef exec rake -The `rake` tasks will take care of installing the needed gem dependencies and cookbooks with `berkshelf`. +The `rake` tasks will take care of installing the needed cookbooks with `berkshelf`. ## Rubocop ## @@ -27,4 +27,4 @@ The `rake` tasks will take care of installing the needed gem dependencies and co ## Chefspec -[ChefSpec](https://github.com/sethvargo/chefspec/) is a unit testing framework for testing Chef cookbooks. ChefSpec makes it easy to write examples and get fast feedback on cookbook changes without the need for virtual machines or cloud servers. +[ChefSpec](https://github.com/sethvargo/chefspec) is a unit testing framework for testing Chef cookbooks. ChefSpec makes it easy to write examples and get fast feedback on cookbook changes without the need for virtual machines or cloud servers. diff --git a/spec/client_spec.rb b/spec/client_spec.rb index a899725..b38b585 100644 --- a/spec/client_spec.rb +++ b/spec/client_spec.rb @@ -5,7 +5,7 @@ require_relative 'spec_helper' describe 'openstack-ops-database::client' do describe 'ubuntu' do include_context 'database-stubs' - let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) } + let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) } let(:node) { runner.node } let(:chef_run) { runner.converge(described_recipe) } diff --git a/spec/mariadb-client-redhat_spec.rb b/spec/mariadb-client-redhat_spec.rb index 367a51d..9afe920 100644 --- a/spec/mariadb-client-redhat_spec.rb +++ b/spec/mariadb-client-redhat_spec.rb @@ -4,7 +4,7 @@ require_relative 'spec_helper' describe 'openstack-ops-database::mariadb-client' do describe 'suse' do - let(:runner) { ChefSpec::Runner.new(REDHAT_OPTS) } + let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) } let(:node) do runner.node.set['openstack']['db']['service_type'] = 'mariadb' runner.node diff --git a/spec/mariadb-client-suse_spec.rb b/spec/mariadb-client-suse_spec.rb index 0a0ea4f..e3917d9 100644 --- a/spec/mariadb-client-suse_spec.rb +++ b/spec/mariadb-client-suse_spec.rb @@ -4,7 +4,7 @@ require_relative 'spec_helper' describe 'openstack-ops-database::mariadb-client' do describe 'suse' do - let(:runner) { ChefSpec::Runner.new(SUSE_OPTS) } + let(:runner) { ChefSpec::SoloRunner.new(SUSE_OPTS) } let(:node) do runner.node.set['openstack']['db']['service_type'] = 'mariadb' runner.node diff --git a/spec/mariadb-client_spec.rb b/spec/mariadb-client_spec.rb index 7976c94..1380c8d 100644 --- a/spec/mariadb-client_spec.rb +++ b/spec/mariadb-client_spec.rb @@ -5,7 +5,7 @@ require_relative 'spec_helper' describe 'openstack-ops-database::mariadb-client' do include_context 'database-stubs' describe 'ubuntu' do - let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) } + let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) } let(:node) do runner.node.set['openstack']['db']['service_type'] = 'mariadb' runner.node diff --git a/spec/mariadb-server-redhat_spec.rb b/spec/mariadb-server-redhat_spec.rb index f353164..38b17eb 100644 --- a/spec/mariadb-server-redhat_spec.rb +++ b/spec/mariadb-server-redhat_spec.rb @@ -5,7 +5,7 @@ require_relative 'spec_helper' describe 'openstack-ops-database::mariadb-server' do describe 'redhat' do include_context 'database-stubs' - let(:runner) { ChefSpec::Runner.new(REDHAT_OPTS) } + let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) } let(:node) { runner.node } let(:chef_run) { runner.converge(described_recipe) } let(:file) { chef_run.template('/etc/my.cnf.d/openstack.cnf') } diff --git a/spec/mariadb-server_spec.rb b/spec/mariadb-server_spec.rb index fa8544c..08812bd 100644 --- a/spec/mariadb-server_spec.rb +++ b/spec/mariadb-server_spec.rb @@ -5,7 +5,7 @@ require_relative 'spec_helper' describe 'openstack-ops-database::mariadb-server' do describe 'ubuntu' do include_context 'database-stubs' - let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) } + let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) } let(:node) { runner.node } let(:chef_run) { runner.converge(described_recipe) } let(:file) { chef_run.template('/etc/mysql/conf.d/openstack.cnf') } diff --git a/spec/mysql-client-suse_spec.rb b/spec/mysql-client-suse_spec.rb index 89f3983..af43fb7 100644 --- a/spec/mysql-client-suse_spec.rb +++ b/spec/mysql-client-suse_spec.rb @@ -4,7 +4,7 @@ require_relative 'spec_helper' describe 'openstack-ops-database::mysql-client' do describe 'suse' do - let(:runner) { ChefSpec::Runner.new(SUSE_OPTS) } + let(:runner) { ChefSpec::SoloRunner.new(SUSE_OPTS) } let(:node) { runner.node } let(:chef_run) { runner.converge(described_recipe) } diff --git a/spec/mysql-client_spec.rb b/spec/mysql-client_spec.rb index 85b8c90..86bc0d9 100644 --- a/spec/mysql-client_spec.rb +++ b/spec/mysql-client_spec.rb @@ -5,7 +5,7 @@ require_relative 'spec_helper' describe 'openstack-ops-database::mysql-client' do include_context 'database-stubs' describe 'ubuntu' do - let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) } + let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) } let(:node) { runner.node } let(:chef_run) { runner.converge(described_recipe) } diff --git a/spec/mysql-server_spec.rb b/spec/mysql-server_spec.rb index f60cfbc..4c7a7e7 100644 --- a/spec/mysql-server_spec.rb +++ b/spec/mysql-server_spec.rb @@ -5,7 +5,7 @@ require_relative 'spec_helper' describe 'openstack-ops-database::mysql-server' do describe 'ubuntu' do include_context 'database-stubs' - let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) } + let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) } let(:node) { runner.node } let(:chef_run) { runner.converge(described_recipe) } diff --git a/spec/openstack-db_spec.rb b/spec/openstack-db_spec.rb index e4046bc..e3ce20d 100644 --- a/spec/openstack-db_spec.rb +++ b/spec/openstack-db_spec.rb @@ -6,7 +6,7 @@ describe 'openstack-ops-database::openstack-db' do include_context 'database-stubs' before do - @chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS + @chef_run = ::ChefSpec::SoloRunner.new ::UBUNTU_OPTS end it 'creates databases and users' do diff --git a/spec/postgresql-server_spec.rb b/spec/postgresql-server_spec.rb index 048dba2..7fe527a 100644 --- a/spec/postgresql-server_spec.rb +++ b/spec/postgresql-server_spec.rb @@ -6,7 +6,7 @@ describe 'openstack-ops-database::postgresql-server' do describe 'ubuntu' do include_context 'database-stubs' - let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) } + let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) } let(:node) { runner.node } let(:chef_run) do # The postgresql cookbook will raise an 'uninitialized constant diff --git a/spec/server_spec.rb b/spec/server_spec.rb index a22f0d4..ea1cb3d 100644 --- a/spec/server_spec.rb +++ b/spec/server_spec.rb @@ -5,7 +5,7 @@ require_relative 'spec_helper' describe 'openstack-ops-database::server' do describe 'ubuntu' do include_context 'database-stubs' - let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) } + let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) } let(:node) { runner.node } let(:chef_run) { runner.converge(described_recipe) }