Updated from OpenStack Ansible Tests

Change-Id: If1bcddd2b9d18c1638a3978a266dcbc74e8b7d08
This commit is contained in:
OpenStack Proposal Bot 2017-08-25 11:28:06 +00:00
parent 1905221593
commit 47fc84aeab
4 changed files with 98 additions and 63 deletions

7
.gitignore vendored
View File

@ -61,11 +61,8 @@ ChangeLog
releasenotes/build releasenotes/build
# Test temp files # Test temp files
tests/plugins tests/common
tests/playbooks tests/*.retry
tests/test.retry
# Vagrant artifacts # Vagrant artifacts
.vagrant .vagrant

31
Vagrantfile vendored
View File

@ -1,12 +1,31 @@
# Verify whether required plugins are installed.
required_plugins = [ "vagrant-disksize" ]
required_plugins.each do |plugin|
if not Vagrant.has_plugin?(plugin)
raise "The vagrant plugin #{plugin} is required. Please run `vagrant plugin install #{plugin}`"
end
end
Vagrant.configure(2) do |config| Vagrant.configure(2) do |config|
config.vm.box = "ubuntu/xenial64"
config.vm.provider "virtualbox" do |v| config.vm.provider "virtualbox" do |v|
v.memory = 2048 v.memory = 2048
v.cpus = 2 v.cpus = 2
end end
config.vm.provision "shell", inline: <<-SHELL
sudo su - config.vm.provision "shell",
cd /vagrant privileged: false,
./run_tests.sh inline: <<-SHELL
SHELL cd /vagrant
./run_tests.sh
SHELL
config.vm.define "ubuntu1604" do |xenial|
xenial.disksize.size = "40GB"
xenial.vm.box = "ubuntu/xenial64"
end
config.vm.define "centos7" do |centos7|
centos7.vm.box = "centos/7"
end
end end

View File

@ -3,39 +3,55 @@
# #
# See the following for details: # See the following for details:
# - http://docs.openstack.org/infra/bindep/ # - http://docs.openstack.org/infra/bindep/
# - https://github.com/openstack-infra/bindep # - https://git.openstack.org/cgit/openstack-infra/bindep
# #
# Even if the role does not make use of this facility, it # Even if the role does not make use of this facility, it
# is better to have this file empty, otherwise OpenStack-CI # is better to have this file empty, otherwise OpenStack-CI
# will fall back to installing its default packages which # will fall back to installing its default packages which
# will potentially be detrimental to the tests executed. # will potentially be detrimental to the tests executed.
#
# Note:
# This file is maintained in the openstack-ansible-tests repository.
# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/bindep.txt
# If you need to remove or add extra dependencies, you should modify
# the central file instead and once your change is accepted then update
# this file as well. The purpose of this file is to ensure that Python and
# Ansible have all their necessary binary requirements on the test host before
# tox executes. Any binary requirements needed by services/roles should be
# installed by those roles in their applicable package install tasks, not through
# using this file.
#
# Base requirements for Ubuntu # Base requirements for Ubuntu
build-essential [platform:dpkg] gcc [platform:dpkg]
git-core [platform:dpkg] git-core [platform:dpkg]
libssl-dev [platform:dpkg] libssl-dev [platform:dpkg]
libffi-dev [platform:dpkg] libffi-dev [platform:dpkg]
python2.7 [platform:dpkg] python2.7 [platform:dpkg]
python-apt [platform:dpkg]
python-dev [platform:dpkg] python-dev [platform:dpkg]
# Base requirements for CentOS # Base requirements for RPM distros
gcc [platform:rpm] gcc [platform:rpm]
gcc-c++ [platform:rpm] gcc-c++ [platform:rpm]
git [platform:rpm] git [platform:rpm]
python-devel [platform:rpm]
libffi-devel [platform:rpm] libffi-devel [platform:rpm]
openssl-devel [platform:rpm] openssl-devel [platform:redhat]
python-devel [platform:rpm]
python2-dnf [platform:fedora]
# For SELinux # For SELinux
libselinux-python [platform:rpm] libselinux-python [platform:redhat]
libsemanage-python [platform:redhat]
# For SSL SNI support # For SSL SNI support
python-pyasn1 [platform:dpkg] python-pyasn1 [platform:dpkg]
python-openssl [platform:dpkg] python-openssl [platform:dpkg]
python-ndg-httpsclient [platform:ubuntu] python-ndg-httpsclient [platform:ubuntu !platform:ubuntu-14]
python2-pyasn1 [platform:rpm] python2-pyasn1 [platform:redhat]
python2-pyOpenSSL [platform:rpm] pyOpenSSL [platform:redhat]
python-ndg_httpsclient [platform:rpm] python-ndg_httpsclient [platform:redhat !platform:fedora]
python2-ndg_httpsclient [platform:fedora]
# Required for compressing collected log files in CI # Required for compressing collected log files in CI
gzip gzip

View File

@ -12,54 +12,57 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
#
# Note:
# This file is maintained in the openstack-ansible-tests repository.
# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/run_tests.sh
# If you need to modify this file, update the one in the openstack-ansible-tests
# repository and then update this file as well. The purpose of this file is to
# prepare the host and then execute all the tox tests.
#
set -xeuo pipefail ## Shell Opts ----------------------------------------------------------------
set -xeu
FUNCTIONAL_TEST=${FUNCTIONAL_TEST:-true} ## Vars ----------------------------------------------------------------------
# Install pip. export WORKING_DIR=${WORKING_DIR:-$(pwd)}
if ! which pip; then
curl --silent --show-error --retry 5 \
https://bootstrap.pypa.io/get-pip.py | sudo python2.7
fi
# Install bindep and tox with pip. ## Main ----------------------------------------------------------------------
sudo pip install bindep tox
# CentOS 7 requires two additional packages: source /etc/os-release || source /usr/lib/os-release
# redhat-lsb-core - for bindep profile support
# epel-release - required to install python-ndg_httpsclient/python2-pyasn1
if which yum; then
sudo yum -y install redhat-lsb-core epel-release
fi
# Get a list of packages to install with bindep. If packages need to be install_pkg_deps() {
# installed, bindep exits with an exit code of 1. pkg_deps="git"
BINDEP_PKGS=$(bindep -b -f bindep.txt test || true)
echo "Packages to install: ${BINDEP_PKGS}"
# Install a list of OS packages provided by bindep. case ${ID,,} in
if which apt-get; then centos|rhel) pkg_mgr_cmd="yum install -y" ;;
sudo apt-get update fedora) pkg_mgr_cmd="dnf -y install" ;;
DEBIAN_FRONTEND=noninteractive \ ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
sudo apt-get -q --option "Dpkg::Options::=--force-confold" \ *) echo "unsupported distribution: ${ID,,}"; exit 1 ;;
--assume-yes install $BINDEP_PKGS esac
elif which yum; then
# Don't run yum with an empty list of packages. eval sudo $pkg_mgr_cmd $pkg_deps
# It will fail and cause the script to exit with an error. }
if [[ ${#BINDEP_PKGS} > 0 ]]; then
sudo yum install -y $BINDEP_PKGS git_clone_repo() {
if [[ ! -d tests/common ]]; then
# The tests repo doesn't need a clone, we can just
# symlink it.
if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then
ln -s ${WORKING_DIR} ${WORKING_DIR}/tests/common
else
git clone -b stable/ocata \
https://git.openstack.org/openstack/openstack-ansible-tests \
tests/common
fi
fi fi
fi }
install_pkg_deps
git_clone_repo
# start executing the main test script
source tests/common/run_tests_common.sh
# Loop through each tox environment and run tests.
for tox_env in $(awk -F= '/envlist/ { gsub(",", " "); print $2 }' tox.ini); do
echo "Executing tox environment: ${tox_env}"
if [[ ${tox_env} == ansible-functional ]]; then
if ${FUNCTIONAL_TEST}; then
tox -e ${tox_env}
fi
else
tox -e ${tox_env}
fi
done