From e84e56c8f2c0241cda69493a93dd2211dc94b893 Mon Sep 17 00:00:00 2001 From: Samuel Cassiba Date: Mon, 10 Dec 2018 16:50:58 -0800 Subject: [PATCH] Pin setuptools and wheels packages In order to maintain consistency for pip versions, align pip, wheels, and setuptools. Use OSA as a basis for consistency between deploy projects. Depends-On: I573bd84e1f15b6e9bda8ebb1d8e12fa66970757a Change-Id: I123508ad8c65805f6d95abe5e592e7e761d63142 --- attributes/default.rb | 2 +- recipes/setup.rb | 4 +++- spec/setup-redhat_spec.rb | 2 +- 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 default['openstack']['integration-test']['platform'] = { tempest_packages: %w(git curl libxslt-devel libxml2-devel python-testrepository - libffi-devel python-devel python-setuptools + libffi-devel python-devel python-gabbi python-testscenarios python-ddt), 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' venv_path = '/opt/tempest-venv' python_virtualenv venv_path do - system_site_packages true + pip_version '18.0' + setuptools_version '40.0.0' + wheel_version '0.31.1' end python_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 it 'installs tempest dependencies' do %w(git curl libxslt-devel libxml2-devel python-testrepository - libffi-devel python-devel python-setuptools + libffi-devel python-devel python-gabbi python-testscenarios python-ddt).each do |pkg| expect(chef_run).to upgrade_package(pkg)