Updated from OpenStack Ansible Tests

Change-Id: If7ddb8697b89d7fb785c00c83c0cfb8f970dd583
This commit is contained in:
OpenStack Proposal Bot 2019-07-18 22:18:13 +00:00
parent 1e077e6899
commit 629eec6ade
2 changed files with 28 additions and 15 deletions

37
Vagrantfile vendored
View File

@ -31,6 +31,30 @@ Vagrant.configure(2) do |config|
./run_tests.sh
SHELL
config.vm.define "centos7" do |centos7|
centos7.vm.box = "centos/7"
end
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|
leap150.vm.box = "opensuse/openSUSE-15.0-x86_64"
end
config.vm.define "opensuse151" do |leap150|
leap150.vm.box = "opensuse/openSUSE-15.1-x86_64"
end
config.vm.define "ubuntu1604" do |xenial|
xenial.disksize.size = "40GB"
xenial.vm.box = "ubuntu/xenial64"
@ -40,17 +64,4 @@ Vagrant.configure(2) do |config|
bionic.disksize.size = "40GB"
bionic.vm.box = "ubuntu/bionic64"
end
config.vm.define "opensuse150" do |leap150|
leap150.vm.box = "opensuse/openSUSE-15.0-x86_64"
end
config.vm.define "opensuse151" do |leap151|
leap151.vm.box = "opensuse/openSUSE-15.1-x86_64"
end
config.vm.define "centos7" do |centos7|
centos7.vm.box = "centos/7"
end
end

View File

@ -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