summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-08 16:53:01 +0000
committerGerrit Code Review <review@openstack.org>2019-01-08 16:53:01 +0000
commit33cd0252148a255aa8eb508d96801c746afe934c (patch)
tree4e91c88ca4e7b59a0cdbe15d813ade7220eb019e
parent443024b8e2084a936029756d1203de6603c1e0e8 (diff)
parente84e56c8f2c0241cda69493a93dd2211dc94b893 (diff)
Merge "Pin setuptools and wheels packages"HEADmaster
-rw-r--r--attributes/default.rb2
-rw-r--r--recipes/setup.rb4
-rw-r--r--spec/setup-redhat_spec.rb2
3 files changed, 5 insertions, 3 deletions
diff --git a/attributes/default.rb b/attributes/default.rb
index addbeaf..3d30725 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -60,7 +60,7 @@ when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
60 default['openstack']['integration-test']['platform'] = { 60 default['openstack']['integration-test']['platform'] = {
61 tempest_packages: %w(git curl libxslt-devel 61 tempest_packages: %w(git curl libxslt-devel
62 libxml2-devel python-testrepository 62 libxml2-devel python-testrepository
63 libffi-devel python-devel python-setuptools 63 libffi-devel python-devel
64 python-gabbi python-testscenarios 64 python-gabbi python-testscenarios
65 python-ddt), 65 python-ddt),
66 package_overrides: '', 66 package_overrides: '',
diff --git a/recipes/setup.rb b/recipes/setup.rb
index 39592f3..39b361e 100644
--- a/recipes/setup.rb
+++ b/recipes/setup.rb
@@ -82,7 +82,9 @@ tempest_path = '/opt/tempest'
82venv_path = '/opt/tempest-venv' 82venv_path = '/opt/tempest-venv'
83 83
84python_virtualenv venv_path do 84python_virtualenv venv_path do
85 system_site_packages true 85 pip_version '18.0'
86 setuptools_version '40.0.0'
87 wheel_version '0.31.1'
86end 88end
87 89
88python_execute 'install tempest' do 90python_execute 'install tempest' do
diff --git a/spec/setup-redhat_spec.rb b/spec/setup-redhat_spec.rb
index 6960b48..dc3fa46 100644
--- a/spec/setup-redhat_spec.rb
+++ b/spec/setup-redhat_spec.rb
@@ -14,7 +14,7 @@ describe 'openstack-integration-test::setup' do
14 it 'installs tempest dependencies' do 14 it 'installs tempest dependencies' do
15 %w(git curl libxslt-devel 15 %w(git curl libxslt-devel
16 libxml2-devel python-testrepository 16 libxml2-devel python-testrepository
17 libffi-devel python-devel python-setuptools 17 libffi-devel python-devel
18 python-gabbi python-testscenarios 18 python-gabbi python-testscenarios
19 python-ddt).each do |pkg| 19 python-ddt).each do |pkg|
20 expect(chef_run).to upgrade_package(pkg) 20 expect(chef_run).to upgrade_package(pkg)