From 91c176dc0d5e3f1f2fa7cde0b087e2757b632e80 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Fri, 25 Aug 2017 11:27:51 +0000 Subject: [PATCH] Updated from OpenStack Ansible Tests Change-Id: Ie494a19c344bce45eb61c13ab9f302f4b278426b --- .gitignore | 1 - Vagrantfile | 28 ++++++++++++----- bindep.txt | 38 +++++++++++++++-------- run_tests.sh | 87 +++++++++++++++++++++++++++------------------------- 4 files changed, 92 insertions(+), 62 deletions(-) diff --git a/.gitignore b/.gitignore index 6079b40f..b57b99d2 100644 --- a/.gitignore +++ b/.gitignore @@ -61,7 +61,6 @@ ChangeLog releasenotes/build # Test temp files -tests/plugins tests/common tests/*.retry diff --git a/Vagrantfile b/Vagrantfile index 7e99e18e..33cb23f8 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,17 +1,31 @@ -Vagrant.configure(2) do |config| +# 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| config.vm.provider "virtualbox" do |v| v.memory = 2048 v.cpus = 2 end + config.vm.provision "shell", + privileged: false, + inline: <<-SHELL + cd /vagrant + ./run_tests.sh + SHELL + config.vm.define "ubuntu1604" do |xenial| + xenial.disksize.size = "40GB" xenial.vm.box = "ubuntu/xenial64" - xenial.vm.provision "shell", inline: <<-SHELL - sudo su - - cd /vagrant - apt-get install -y python2.7 - ./run_tests.sh - SHELL end + + config.vm.define "centos7" do |centos7| + centos7.vm.box = "centos/7" + end + end diff --git a/bindep.txt b/bindep.txt index 7d7200e8..cc2aca5a 100644 --- a/bindep.txt +++ b/bindep.txt @@ -3,41 +3,55 @@ # # See the following for details: # - 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 # is better to have this file empty, otherwise OpenStack-CI # will fall back to installing its default packages which # 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 -build-essential [platform:dpkg] +gcc [platform:dpkg] git-core [platform:dpkg] libssl-dev [platform:dpkg] libffi-dev [platform:dpkg] python2.7 [platform:dpkg] +python-apt [platform:dpkg] python-dev [platform:dpkg] -# Base requirements for CentOS +# Base requirements for RPM distros gcc [platform:rpm] gcc-c++ [platform:rpm] git [platform:rpm] -python-devel [platform:rpm] - -# Requirements for Paramiko 2.0 libffi-devel [platform:rpm] -openssl-devel [platform:rpm] +openssl-devel [platform:redhat] +python-devel [platform:rpm] +python2-dnf [platform:fedora] # For SELinux -libselinux-python [platform:rpm] +libselinux-python [platform:redhat] +libsemanage-python [platform:redhat] # For SSL SNI support python-pyasn1 [platform:dpkg] python-openssl [platform:dpkg] -python-ndg-httpsclient [platform:ubuntu] -python2-pyasn1 [platform:rpm] -python2-pyOpenSSL [platform:rpm] -python-ndg_httpsclient [platform:rpm] +python-ndg-httpsclient [platform:ubuntu !platform:ubuntu-14] +python2-pyasn1 [platform:redhat] +pyOpenSSL [platform:redhat] +python-ndg_httpsclient [platform:redhat !platform:fedora] +python2-ndg_httpsclient [platform:fedora] # Required for compressing collected log files in CI gzip diff --git a/run_tests.sh b/run_tests.sh index 44b0404d..8f87c457 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -12,54 +12,57 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # 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. -if ! which pip; then - curl --silent --show-error --retry 5 \ - https://bootstrap.pypa.io/get-pip.py | sudo python2.7 -fi +export WORKING_DIR=${WORKING_DIR:-$(pwd)} -# Install bindep and tox with pip. -sudo pip install bindep tox +## Main ---------------------------------------------------------------------- -# CentOS 7 requires two additional packages: -# 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 +source /etc/os-release || source /usr/lib/os-release -# Get a list of packages to install with bindep. If packages need to be -# installed, bindep exits with an exit code of 1. -BINDEP_PKGS=$(bindep -b -f bindep.txt test || true) -echo "Packages to install: ${BINDEP_PKGS}" +install_pkg_deps() { + pkg_deps="git" -# Install a list of OS packages provided by bindep. -if which apt-get; then - sudo apt-get update - DEBIAN_FRONTEND=noninteractive \ - sudo apt-get -q --option "Dpkg::Options::=--force-confold" \ - --assume-yes install $BINDEP_PKGS -elif which yum; then - # Don't run yum with an empty list of packages. - # It will fail and cause the script to exit with an error. - if [[ ${#BINDEP_PKGS} > 0 ]]; then - sudo yum install -y $BINDEP_PKGS + case ${ID,,} in + centos|rhel) pkg_mgr_cmd="yum install -y" ;; + fedora) pkg_mgr_cmd="dnf -y install" ;; + ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;; + *) echo "unsupported distribution: ${ID,,}"; exit 1 ;; + esac + + eval sudo $pkg_mgr_cmd $pkg_deps +} + +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 +} + +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