Browse Source

integration-test refactor for Pike and Chef 13

- implemented foodcritic and cookstyle corrections
- switched Tempest installation back to packages since it is now fresh enough for use
- deprecated node.foo.bar method access for node['foo']['bar'] bracket syntax
- removed calls to GitHub for Tempest
- moved apt package_overrides to common cookbook

Implements blueprint modern-chef

Change-Id: Ia315e51d9ef3fd4677b65074cd7f18a47669208d
Depends-On: I5c5371eed12b282a527576822b270cce8b0e76a7
changes/57/523157/7
Samuel Cassiba 3 years ago
parent
commit
badb2eac3d
11 changed files with 236 additions and 93 deletions
  1. +11
    -15
      Berksfile
  2. +176
    -0
      LICENSE
  3. +15
    -16
      Rakefile
  4. +8
    -6
      attributes/default.rb
  5. +2
    -2
      metadata.rb
  6. +1
    -1
      recipes/run_tempest.rb
  7. +14
    -35
      recipes/setup.rb
  8. +5
    -3
      spec/setup-redhat_spec.rb
  9. +2
    -12
      spec/setup_spec.rb
  10. +1
    -1
      spec/spec_helper.rb
  11. +1
    -2
      templates/default/tempest.sh.erb

+ 11
- 15
Berksfile View File

@ -1,18 +1,14 @@
source 'https://supermarket.chef.io'
metadata
%w(block-storage common compute identity image network).each do |cookbook|
if Dir.exist?("../cookbook-openstack-#{cookbook}")
cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
else
cookbook "openstack-#{cookbook}", github: "openstack/cookbook-openstack-#{cookbook}"
end
end
cookbook 'openstackclient',
github: 'cloudbau/cookbook-openstackclient'
cookbook "openstack-common",
github: "openstack/cookbook-openstack-common"
cookbook "openstack-identity",
github: "openstack/cookbook-openstack-identity"
cookbook "openstack-image",
github: "openstack/cookbook-openstack-image"
cookbook "openstack-compute",
github: "openstack/cookbook-openstack-compute"
cookbook "openstack-network",
github: "openstack/cookbook-openstack-network"
cookbook "openstack-block-storage",
github: "openstack/cookbook-openstack-block-storage"
cookbook "openstackclient",
github: "cloudbau/cookbook-openstackclient"
metadata

+ 176
- 0
LICENSE View File

@ -0,0 +1,176 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

+ 15
- 16
Rakefile View File

@ -1,40 +1,39 @@
task default: ["test"]
task default: ['test']
task :test => [:syntax, :lint, :unit]
task test: [:syntax, :lint, :unit]
desc "Vendor the cookbooks in the Berksfile"
desc 'Vendor the cookbooks in the Berksfile'
task :berks_prep do
sh %{chef exec berks vendor}
sh %(chef exec berks vendor)
end
desc "Run FoodCritic (syntax) tests"
desc 'Run FoodCritic (syntax) tests'
task :syntax do
sh %{chef exec foodcritic --exclude spec -f any .}
sh %(chef exec foodcritic --exclude spec -f any .)
end
desc "Run RuboCop (lint) tests"
desc 'Run RuboCop (lint) tests'
task :lint do
sh %{chef exec cookstyle}
sh %(chef exec cookstyle)
end
desc "Run RSpec (unit) tests"
task :unit => :berks_prep do
sh %{chef exec rspec --format documentation}
desc 'Run RSpec (unit) tests'
task unit: :berks_prep do
sh %(chef exec rspec --format documentation)
end
desc "Remove the berks-cookbooks directory and the Berksfile.lock"
desc 'Remove the berks-cookbooks directory and the Berksfile.lock'
task :clean do
rm_rf [
'berks-cookbooks',
'Berksfile.lock'
'Berksfile.lock',
]
end
desc "All-in-One Neutron build Infra using Common task"
desc 'All-in-One Neutron build Infra using Common task'
task :integration do
# Use the common integration task
sh %(wget -nv -t 3 -O Rakefile-Common https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/Rakefile)
load './Rakefile-Common'
Rake::Task["common_integration"].invoke
Rake::Task['common_integration'].invoke
end

+ 8
- 6
attributes/default.rb View File

@ -55,19 +55,21 @@ default['openstack']['integration-test'] = {
}
# platform-specific settings
case platform_family
case node['platform_family']
when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
default['openstack']['integration-test']['platform'] = {
tempest_packages: %w(git libxslt-devel
libxml2-devel python-testrepository
libffi-devel python-devel python-setuptools),
libffi-devel python-devel python-setuptools
openstack-tempest),
package_overrides: '',
}
when 'debian'
default['openstack']['integration-test']['platform'] = {
tempest_packages: %w(git libssl-dev libffi-dev python-dev libxml2-dev
libxslt1-dev libpq-dev libxml2-dev libxslt-dev
testrepository python-dev libffi-dev),
package_overrides: "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'",
'tempest_packages' => %w(git libssl-dev libffi-dev python-dev libxml2-dev
libxslt1-dev libpq-dev libxml2-dev libxslt-dev
testrepository python-dev libffi-dev
python-gabbi tempest),
'package_overrides' => '',
}
end

+ 2
- 2
metadata.rb View File

@ -1,7 +1,7 @@
name 'openstack-integration-test'
maintainer 'openstack-chef'
maintainer_email 'openstack-dev@lists.openstack.org'
license 'Apache 2.0'
license 'Apache-2.0'
description 'Installs and configures the Tempest Integration Test Suite'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '16.0.0'
@ -19,7 +19,7 @@ depends 'openstack-compute', '>= 16.0.0'
depends 'openstack-block-storage', '>= 16.0.0'
depends 'openstackclient'
depends 'poise-python', '~> 1.5'
depends 'poise-python'
issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)
source_url 'https://github.com/openstack/cookbook-openstack-integration-test' if respond_to?(:source_url)


+ 1
- 1
recipes/run_tempest.rb View File

@ -19,7 +19,7 @@
execute 'run_tempest' do
# Write log file to test VM's /root directory.
command 'cd /opt/tempest; /opt/tempest-venv/tempest.sh'
command 'tempest run --smoke --serial --config-file /etc/tempest/tempest.conf'
action :nothing
end


+ 14
- 35
recipes/setup.rb View File

@ -27,7 +27,9 @@ end
platform_options = node['openstack']['integration-test']['platform']
python_runtime '2'
python_runtime '2' do
provider :system
end
platform_options['tempest_packages'].each do |pkg|
package pkg do
@ -85,41 +87,18 @@ connection_params = {
connection_params connection_params
action :grant_role
end
end
heat_stack_user_role = node['openstack']['integration-test']['heat_stack_user_role']
openstack_role heat_stack_user_role do
connection_params connection_params
end
tempest_path = '/opt/tempest'
venv_path = '/opt/tempest-venv'
python_virtualenv venv_path
python_execute 'install tempest' do
action :nothing
command '-m pip install .'
cwd tempest_path
virtualenv venv_path
end
git tempest_path do
repository 'https://github.com/openstack/tempest'
reference 'master'
depth 1
action :sync
notifies :run, 'python_execute[install tempest]', :immediately
end
heat_stack_user_role = node['openstack']['integration-test']['heat_stack_user_role']
openstack_role heat_stack_user_role do
connection_params connection_params
end
template "#{venv_path}/tempest.sh" do
source 'tempest.sh.erb'
user 'root'
group 'root'
mode 0o755
variables(
venv_path: venv_path
)
openstack_user service_user do
domain_name service_domain
user_name service_user
connection_params connection_params
action :grant_domain
end
end
%w(image1 image2).each do |img|
@ -171,7 +150,7 @@ end
integration_test_conf_options = merge_config_options 'integration-test'
# create the keystone.conf from attributes
template '/opt/tempest/etc/tempest.conf' do
template '/etc/tempest/tempest.conf' do
source 'openstack-service.conf.erb'
cookbook 'openstack-common'
owner 'root'


+ 5
- 3
spec/setup-redhat_spec.rb View File

@ -11,9 +11,11 @@ describe 'openstack-integration-test::setup' do
include_context 'tempest-stubs'
it 'installs tempest dependencies' do
%w(git libxslt-devel libxml2-devel
python-testrepository libffi-devel).each do |pkg|
it 'installs tempest from package' do
%w(git libxslt-devel
libxml2-devel python-testrepository
libffi-devel python-devel python-setuptools
openstack-tempest).each do |pkg|
expect(chef_run).to upgrade_package(pkg)
end
end


+ 2
- 12
spec/setup_spec.rb View File

@ -104,16 +104,6 @@ describe 'openstack-integration-test::setup' do
)
end
it 'syncs /opt/tempest from github' do
expect(chef_run).to sync_git(
'/opt/tempest'
).with(
repository: 'https://github.com/openstack/tempest',
reference: 'master',
depth: 1
)
end
it 'uploads image1' do
expect(chef_run).to upload_openstack_image_image('image1').with(
identity_user: 'admin',
@ -143,7 +133,7 @@ describe 'openstack-integration-test::setup' do
end
describe 'tempest.conf default' do
let(:file) { chef_run.template('/opt/tempest/etc/tempest.conf') }
let(:file) { chef_run.template('/etc/tempest/tempest.conf') }
it 'creates tempest.conf' do
expect(chef_run).to create_template(file.name).with(
@ -184,7 +174,7 @@ describe 'openstack-integration-test::setup' do
runner.node.normal['openstack']['endpoints']['public']['identity']['scheme'] = 'https'
runner.converge(described_recipe)
end
let(:file) { chef_run.template('/opt/tempest/etc/tempest.conf') }
let(:file) { chef_run.template('/etc/tempest/tempest.conf') }
it 'has a v2 auth URI with the secure scheme' do
expect(chef_run).to render_file(file.name).with_content(


+ 1
- 1
spec/spec_helper.rb View File

@ -9,7 +9,7 @@ require 'chef/application'
LOG_LEVEL = :fatal
REDHAT_OPTS = {
platform: 'redhat',
version: '7.1',
version: '7.3',
log_level: LOG_LEVEL,
}.freeze
UBUNTU_OPTS = {


+ 1
- 2
templates/default/tempest.sh.erb View File

@ -1,3 +1,2 @@
#!/bin/bash
source <%= @venv_path -%>/bin/activate
tempest run --smoke --serial
tempest run --smoke --serial --config-file /etc/tempest/tempest.conf

Loading…
Cancel
Save