Updated from OpenStack Ansible Tests

Change-Id: Ia3e169b514c5acae116777d47ceeb61b03984622
This commit is contained in:
OpenStack Proposal Bot 2019-08-20 03:05:35 +00:00
parent d789b36c78
commit 1f1f34942d
4 changed files with 38 additions and 30 deletions

28
.gitignore vendored
View File

@ -1,3 +1,14 @@
# Add patterns in here to exclude files created by tools integrated with this
# repository, such as test frameworks from the project's recommended workflow,
# rendered documentation and package builds.
#
# Don't add patterns to exclude files created by preferred personal tools
# (editors, IDEs, your operating system itself even). These should instead be
# maintained outside the repository, for example in a ~/.gitignore file added
# with:
#
# git config --global core.excludesfile '~/.gitignore'
# Compiled source # # Compiled source #
################### ###################
*.com *.com
@ -33,25 +44,11 @@ logs/*
# OS generated files # # OS generated files #
###################### ######################
.DS_Store
.DS_Store?
._* ._*
.Spotlight-V100
.Trashes
.idea
.tox .tox
*.sublime*
*.egg-info *.egg-info
Icon?
ehthumbs.db
Thumbs.db
.eggs .eggs
# User driven backup files #
############################
*.bak
*.swp
# Generated by pbr while building docs # Generated by pbr while building docs
###################################### ######################################
AUTHORS AUTHORS
@ -70,6 +67,3 @@ tests/*.retry
# Git clones # Git clones
openstack-ansible-ops openstack-ansible-ops
previous previous
# Editor files
.vscode

24
Vagrantfile vendored
View File

@ -31,14 +31,20 @@ Vagrant.configure(2) do |config|
./run_tests.sh ./run_tests.sh
SHELL SHELL
config.vm.define "ubuntu1604" do |xenial| config.vm.define "centos7" do |centos7|
xenial.disksize.size = "40GB" centos7.vm.box = "centos/7"
xenial.vm.box = "ubuntu/xenial64"
end end
config.vm.define "ubuntu1804" do |bionic| config.vm.define "debian8" do |debian8|
bionic.disksize.size = "40GB" debian8.vm.box = "debian/jessie64"
bionic.vm.box = "ubuntu/bionic64" end
config.vm.define "debian9" do |debian9|
debian9.vm.box = "debian/stretch64"
end
config.vm.define "gentoo" do |gentoo|
gentoo.vm.box = "generic/gentoo"
end end
config.vm.define "opensuse150" do |leap150| config.vm.define "opensuse150" do |leap150|
@ -49,8 +55,8 @@ Vagrant.configure(2) do |config|
leap151.vm.box = "opensuse/openSUSE-15.1-x86_64" leap151.vm.box = "opensuse/openSUSE-15.1-x86_64"
end end
config.vm.define "centos7" do |centos7| config.vm.define "ubuntu1804" do |bionic|
centos7.vm.box = "centos/7" bionic.disksize.size = "40GB"
bionic.vm.box = "ubuntu/bionic64"
end end
end end

View File

@ -2,9 +2,15 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
# this is required for the docs build jobs # WARNING:
# This file is maintained in the openstack-ansible-tests repository.
# https://opendev.org/openstack/openstack-ansible-tests/src/branch/master/sync/doc/requirements.txt
# If you need to modify this file, update the one in the
# openstack-ansible-tests repository. Once it merges there, the changes will
# automatically be proposed to all the repositories which use it.
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
openstackdocstheme>=1.18.1 # Apache-2.0 openstackdocstheme>=1.20.0 # Apache-2.0
reno>=2.5.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0
doc8>=0.6.0 # Apache-2.0 doc8>=0.6.0 # Apache-2.0

View File

@ -65,7 +65,10 @@ case ${ID,,} in
esac esac
# Install git so that we can clone the tests repo if git is not available # Install git so that we can clone the tests repo if git is not available
which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" git case ${ID,,} in
gentoo) which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" dev-vcs/git ;;
*) which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" git ;;
esac
# Clone the tests repo for access to the common test script # Clone the tests repo for access to the common test script
if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then
@ -92,4 +95,3 @@ fi
# Execute the common test script # Execute the common test script
source tests/common/run_tests_common.sh source tests/common/run_tests_common.sh