Merge "Update tox configuration"

5 files changed, 21 insertions, 63 deletions

diff --git a/Gemfile b/Gemfile
index 1fab608..caddc65 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,7 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test, :system_tests do
-  gem 'puppet-openstack_spec_helper',
-      :git     => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
-      :require => false
+  gem 'puppet-openstack_spec_helper', :require => 'false', :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper'
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']
diff --git a/bindep.txt b/bindep.txt
index 4f9b425..7cdd58e 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,2 +1,11 @@
 # This is a cross-platform list tracking distribution packages needed by tests;
 # see http://docs.openstack.org/infra/bindep/ for additional information.
+
+libxml2-devel [test platform:rpm]
+libxml2-dev [test platform:dpkg]
+libxslt-devel [test platform:rpm]
+libxslt1-dev [test platform:dpkg]
+ruby-devel [test platform:rpm]
+ruby-dev [test platform:dpkg]
+zlib1g-dev [test platform:dpkg]
+zlib-devel [test platform:rpm]
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 429e807..9196bc9 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,56 +1 @@
-require 'beaker-rspec'
-require 'beaker/puppet_install_helper'
-
-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
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    hosts.each do |host|
-
-      # install git
-      install_package host, 'git'
-
-      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} #{repo}"
-      end
-
-      on host, "ZUUL_REF=#{zuul_ref} ZUUL_BRANCH=#{zuul_branch} ZUUL_URL=#{zuul_url} bash #{repo}/install_modules.sh"
-
-      # Install the module being tested
-      on host, "rm -fr /etc/puppet/modules/#{modname}"
-      puppet_module_install(:source => proj_root, :module_name => modname)
-
-      on host, "rm -fr #{repo}"
-
-      # List modules installed to help with debugging
-      on host, puppet('module','list'), { :acceptable_exit_codes => 0 }
-    end
-  end
-end
+require 'puppet-openstack_spec_helper/beaker_spec_helper'
diff --git a/test-requirements.txt b/test-requirements.txt
index bedd666..1ea50a8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,7 @@
-# this is required for the docs build jobs
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-oslosphinx>=2.5.0 # Apache-2.0
-reno>=0.1.1 # Apache-2.0
+# This is required for the docs build jobs
+sphinx>=1.5.1  # BSD
+oslosphinx>=4.7.0  # Apache-2.0
+
+# This is required for the releasenotes build jobs
+# FIXME: reno is manually pinned to !=2.0.0 because of bug #1651995
+reno>=1.8.0,!=2.0.0  # Apache-2.0
diff --git a/tox.ini b/tox.ini
index aea06c8..cd122cb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,9 @@ minversion = 1.6
 skipsdist = True
 envlist = releasenotes
 
+[testenv]
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+
 [testenv:releasenotes]
 deps = -rtest-requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html