Try to use zuul-cloner to prepare fixtures

In OpenStack Infra, we would like to run Puppet unit tests that
sometimes depends on other Puppet OpenStack modules.
Example: a patch in puppet-openstacklib that needs to be tested in puppet-nova.

This patch modifies the Rakefile to:
* clean spec_prep and spec_clean Rake tasks
* use openstack/puppet-openstack-integration/install_modules_unit.sh script
  to clone modules.
* do not use .fixtures.yaml file to clone modules and rely on
  zuul-cloner or git.
* Add openstack/ in gitignore so we never commit the
  puppet-openstack-integration repository (can happen when spec_clean
  did not run but you want to submit the patch anyway)
* Allow to run a custom Puppetfile if PUPPETFILE env is exported. It
  will allow people to test the module with the dependencies they like,
  feature we had with .fixtures.yaml.

Also add 'r10k' to Gemfile.

That way, we will be able to use zuul dependencies and run tests accross
modules like we do with functional testing.

It also fix proxy/ceilometer rspec syntax for Puppet 3.x. This change
could not be in a separated patchset since it's related to this patch.

Change-Id: I8d20b5297dde8a2ecfcaf3d21d221735bc9df8d6
This commit is contained in:
Emilien Macchi 2015-10-08 14:39:23 -07:00
parent f1f9a24998
commit 68eb6373f0
5 changed files with 67 additions and 16 deletions

View File

@ -1,15 +0,0 @@
fixtures:
repositories:
"apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
"concat":
"repo": "git://github.com/puppetlabs/puppetlabs-concat.git"
"ref": "1.2.1"
"inifile": "git://github.com/puppetlabs/puppetlabs-inifile"
"keystone": "git://github.com/openstack/puppet-keystone.git"
"memcached": "git://github.com/saz/puppet-memcached.git"
"openstacklib": "git://github.com/openstack/puppet-openstacklib.git"
"rsync": "git://github.com/puppetlabs/puppetlabs-rsync.git"
"stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
"xinetd": "git://github.com/puppetlabs/puppetlabs-xinetd.git"
symlinks:
"swift": "#{source_dir}"

1
.gitignore vendored
View File

@ -8,3 +8,4 @@ coverage/
.idea/ .idea/
*.swp *.swp
*.iml *.iml
openstack/

View File

@ -19,6 +19,7 @@ end
group :system_tests do group :system_tests do
gem 'beaker-rspec', :require => 'false' gem 'beaker-rspec', :require => 'false'
gem 'beaker-puppet_install_helper', :require => 'false' gem 'beaker-puppet_install_helper', :require => 'false'
gem 'r10k', :require => 'false'
end end
if facterversion = ENV['FACTER_GEM_VERSION'] if facterversion = ENV['FACTER_GEM_VERSION']

View File

@ -1,6 +1,9 @@
require 'puppetlabs_spec_helper/rake_tasks' require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint' require 'puppet-lint/tasks/puppet-lint'
require 'puppet-syntax/tasks/puppet-syntax' require 'puppet-syntax/tasks/puppet-syntax'
require 'json'
modname = JSON.parse(open('metadata.json').read)['name'].split('-')[1]
PuppetSyntax.exclude_paths ||= [] PuppetSyntax.exclude_paths ||= []
PuppetSyntax.exclude_paths << "spec/fixtures/**/*" PuppetSyntax.exclude_paths << "spec/fixtures/**/*"
@ -19,3 +22,64 @@ desc "Run acceptance tests"
RSpec::Core::RakeTask.new(:acceptance) do |t| RSpec::Core::RakeTask.new(:acceptance) do |t|
t.pattern = 'spec/acceptance' t.pattern = 'spec/acceptance'
end end
Rake::Task[:spec_prep].clear
desc 'Create the fixtures directory'
task :spec_prep do
# Allow to test the module with custom dependencies
# like you could do with .fixtures file
if ENV['PUPPETFILE']
puppetfile = ENV['PUPPETFILE']
if ENV['GEM_HOME']
gem_home = ENV['GEM_HOME']
gem_bin_dir = "#{gem_home}" + '/bin/'
else
gem_bin_dir = ''
end
r10k = ['env']
r10k += ["PUPPETFILE=#{puppetfile}"]
r10k += ["PUPPETFILE_DIR=#{Dir.pwd}/spec/fixtures/modules"]
r10k += ["#{gem_bin_dir}r10k"]
r10k += ['puppetfile', 'install', '-v']
sh(*r10k)
else
# otherwise, use official OpenStack Puppetfile
zuul_ref = ENV['ZUUL_REF']
zuul_branch = ENV['ZUUL_BRANCH']
zuul_url = ENV['ZUUL_URL']
repo = 'openstack/puppet-openstack-integration'
rm_rf(repo)
if File.exists?('/usr/zuul-env/bin/zuul-cloner')
zuul_clone_cmd = ['/usr/zuul-env/bin/zuul-cloner']
zuul_clone_cmd += ['--cache-dir', '/opt/git']
zuul_clone_cmd += ['--zuul-ref', "#{zuul_ref}"]
zuul_clone_cmd += ['--zuul-branch', "#{zuul_branch}"]
zuul_clone_cmd += ['--zuul-url', "#{zuul_url}"]
zuul_clone_cmd += ['git://git.openstack.org', "#{repo}"]
sh(*zuul_clone_cmd)
else
sh("git clone https://git.openstack.org/#{repo} #{repo}")
end
script = ['env']
script += ["PUPPETFILE_DIR=#{Dir.pwd}/spec/fixtures/modules"]
script += ["ZUUL_REF=#{zuul_ref}"]
script += ["ZUUL_BRANCH=#{zuul_branch}"]
script += ["ZUUL_URL=#{zuul_url}"]
script += ['bash', "#{repo}/install_modules_unit.sh"]
sh(*script)
end
rm_rf("spec/fixtures/modules/#{modname}")
ln_s(Dir.pwd, "spec/fixtures/modules/#{modname}")
mkdir_p('spec/fixtures/manifests')
touch('spec/fixtures/manifests/site.pp')
end
Rake::Task[:spec_clean].clear
desc 'Clean up the fixtures directory'
task :spec_clean do
rm_rf('spec/fixtures/modules')
rm_rf('openstack')
if File.zero?('spec/fixtures/manifests/site.pp')
rm_f('spec/fixtures/manifests/site.pp')
end
end

View File

@ -24,7 +24,7 @@ describe 'swift::proxy::ceilometer' do
it { is_expected.to contain_file(fragment_file).with_content(/[filter:ceilometer]/) } it { is_expected.to contain_file(fragment_file).with_content(/[filter:ceilometer]/) }
it { is_expected.to contain_file(fragment_file).with_content(/use = egg:ceilometer#swift/) } it { is_expected.to contain_file(fragment_file).with_content(/use = egg:ceilometer#swift/) }
if Puppet.version.to_f < 4.0 if Puppet.version.to_f < 4.0
it { is_expected.to contain_concat__fragment('swift_ceilometer').with_require('Class[::Ceilometer]')} it { is_expected.to contain_concat__fragment('swift_ceilometer').with_require('Class[Ceilometer]')}
else else
it { is_expected.to contain_concat__fragment('swift_ceilometer').with_require('Class[Ceilometer]')} it { is_expected.to contain_concat__fragment('swift_ceilometer').with_require('Class[Ceilometer]')}
end end