Updated from OpenStack Ansible Tests
Change-Id: I407267fc32a4a755ab2ee91095ddc401f68a1b19
This commit is contained in:
parent
97c03b8dec
commit
d4422a137d
28
.gitignore
vendored
28
.gitignore
vendored
@ -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 #
|
||||
###################
|
||||
*.com
|
||||
@ -33,25 +44,11 @@ logs/*
|
||||
|
||||
# OS generated files #
|
||||
######################
|
||||
.DS_Store
|
||||
.DS_Store?
|
||||
._*
|
||||
.Spotlight-V100
|
||||
.Trashes
|
||||
.idea
|
||||
.tox
|
||||
*.sublime*
|
||||
*.egg-info
|
||||
Icon?
|
||||
ehthumbs.db
|
||||
Thumbs.db
|
||||
.eggs
|
||||
|
||||
# User driven backup files #
|
||||
############################
|
||||
*.bak
|
||||
*.swp
|
||||
|
||||
# Generated by pbr while building docs
|
||||
######################################
|
||||
AUTHORS
|
||||
@ -70,6 +67,3 @@ tests/*.retry
|
||||
# Git clones
|
||||
openstack-ansible-ops
|
||||
previous
|
||||
|
||||
# Editor files
|
||||
.vscode
|
||||
|
24
Vagrantfile
vendored
24
Vagrantfile
vendored
@ -31,14 +31,20 @@ Vagrant.configure(2) do |config|
|
||||
./run_tests.sh
|
||||
SHELL
|
||||
|
||||
config.vm.define "ubuntu1604" do |xenial|
|
||||
xenial.disksize.size = "40GB"
|
||||
xenial.vm.box = "ubuntu/xenial64"
|
||||
config.vm.define "centos7" do |centos7|
|
||||
centos7.vm.box = "centos/7"
|
||||
end
|
||||
|
||||
config.vm.define "ubuntu1804" do |bionic|
|
||||
bionic.disksize.size = "40GB"
|
||||
bionic.vm.box = "ubuntu/bionic64"
|
||||
config.vm.define "debian8" do |debian8|
|
||||
debian8.vm.box = "debian/jessie64"
|
||||
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
|
||||
|
||||
config.vm.define "opensuse150" do |leap150|
|
||||
@ -49,8 +55,8 @@ Vagrant.configure(2) do |config|
|
||||
leap151.vm.box = "opensuse/openSUSE-15.1-x86_64"
|
||||
end
|
||||
|
||||
config.vm.define "centos7" do |centos7|
|
||||
centos7.vm.box = "centos/7"
|
||||
config.vm.define "ubuntu1804" do |bionic|
|
||||
bionic.disksize.size = "40GB"
|
||||
bionic.vm.box = "ubuntu/bionic64"
|
||||
end
|
||||
|
||||
end
|
||||
|
@ -2,9 +2,15 @@
|
||||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# 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;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
|
||||
doc8>=0.6.0 # Apache-2.0
|
||||
|
@ -65,7 +65,10 @@ case ${ID,,} in
|
||||
esac
|
||||
|
||||
# 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
|
||||
if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then
|
||||
@ -92,4 +95,3 @@ fi
|
||||
|
||||
# Execute the common test script
|
||||
source tests/common/run_tests_common.sh
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user