From 643469f5caeb00309b5f08ca67dded8cd1eb4094 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Tue, 7 Jul 2015 13:07:52 -0700 Subject: [PATCH] Use module install script for acceptance tests This patch updates the spec_helper_acceptance.rb file to use the common module install script and Puppetfile from the new openstack/puppet-openstack-integration repo. This will allow us to take advantage of Zuul's Depends-On feature so that we can test changes across multiple related modules. This is based on idea 1 from this brainstorming session[1]. This will probably be abstracted out into a separate function or eventually a separate gem so that it can be more easily shared across the OpenStack modules and the Infra modules. [1] https://etherpad.openstack.org/p/puppet-git-dependencies Change-Id: Ia47b609f1d05f5f9000dd977b9ded35afbe7e3f4 Co-Authored-By: James E. Blair Co-Authored-By: Spencer Krum --- spec/spec_helper_acceptance.rb | 45 +++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 23eaaf1..e0f2748 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -6,6 +6,7 @@ run_puppet_install_helper RSpec.configure do |c| # Project root proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..')) + modname = JSON.parse(open('metadata.json').read)['name'].split('-')[1] # Readable test descriptions c.formatter = :documentation @@ -18,26 +19,36 @@ RSpec.configure do |c| # install git install_package host, 'git' - # clean out any module cruft - shell('rm -fr /etc/puppet/modules/*') + zuul_ref = ENV['ZUUL_REF'] + zuul_branch = ENV['ZUUL_BRANCH'] + zuul_url = ENV['ZUUL_URL'] + + repo = 'openstack/puppet-openstack-integration' + + # Start out with clean moduledir, don't trust r10k to purge it + on host, "rm -rf /etc/puppet/modules/*" + # Install dependent modules via git or zuul + r = on host, "test -e /usr/zuul-env/bin/zuul-cloner", { :acceptable_exit_codes => [0,1] } + if r.exit_code == 0 + 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}" + on host, zuul_clone_cmd + else + on host, "git clone https://git.openstack.org/#{repo}" + end + + on host, "ZUUL_REF=#{zuul_ref} ZUUL_BRANCH=#{zuul_branch} ZUUL_URL=#{zuul_url} bash #{repo}/install_modules.sh" - # install library modules from the forge - on host, puppet('module','install','puppetlabs-inifile'), { :acceptable_exit_codes => 0 } - on host, puppet('module','install','puppetlabs-mongodb'), { :acceptable_exit_codes => 0 } - on host, puppet('module','install','puppetlabs-mysql'), { :acceptable_exit_codes => 0 } - on host, puppet('module','install','dprince/qpid'), { :acceptable_exit_codes => 0 } - on host, puppet('module','install','stahnma-epel'), { :acceptable_exit_codes => 0 } + # Install the module being tested + on host, "rm -fr /etc/puppet/modules/#{modname}" + puppet_module_install(:source => proj_root, :module_name => modname) - # install puppet modules from git, use master - shell('git clone https://git.openstack.org/openstack/puppet-openstacklib /etc/puppet/modules/openstacklib') - shell('git clone https://git.openstack.org/openstack/puppet-openstack_extras /etc/puppet/modules/openstack_extras') - shell('git clone https://git.openstack.org/openstack/puppet-keystone /etc/puppet/modules/keystone') - # TODO(EmilienM) Cloning RabbitMQ module for now because we wait for a release including - # https://github.com/enovance/puppetlabs-rabbitmq/commit/0227f762070ffbbea3c28d6a60174de98fa4cc1c - shell('git clone https://github.com/puppetlabs/puppetlabs-rabbitmq/ /etc/puppet/modules/rabbitmq') + on host, "rm -fr #{repo}" - # Install the module being tested - puppet_module_install(:source => proj_root, :module_name => 'ceilometer') # List modules installed to help with debugging on hosts[0], puppet('module','list'), { :acceptable_exit_codes => 0 } end -- 2.45.2