Updated from OpenStack Ansible Tests
Change-Id: I216aec6277abfeef91450093d64249733676fb82
This commit is contained in:
parent
e4d8d58bff
commit
abbc5b8094
|
@ -67,4 +67,5 @@ tests/*.retry
|
||||||
# Vagrant artifacts
|
# Vagrant artifacts
|
||||||
.vagrant
|
.vagrant
|
||||||
|
|
||||||
|
# Git clones
|
||||||
|
openstack-ansible-ops
|
||||||
|
|
|
@ -1,3 +1,11 @@
|
||||||
|
# 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.provider "virtualbox" do |v|
|
config.vm.provider "virtualbox" do |v|
|
||||||
v.memory = 2048
|
v.memory = 2048
|
||||||
|
@ -12,6 +20,7 @@ Vagrant.configure(2) do |config|
|
||||||
SHELL
|
SHELL
|
||||||
|
|
||||||
config.vm.define "ubuntu1604" do |xenial|
|
config.vm.define "ubuntu1604" do |xenial|
|
||||||
|
xenial.disksize.size = "40GB"
|
||||||
xenial.vm.box = "ubuntu/xenial64"
|
xenial.vm.box = "ubuntu/xenial64"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
18
run_tests.sh
18
run_tests.sh
|
@ -21,8 +21,15 @@
|
||||||
# prepare the host and then execute all the tox tests.
|
# prepare the host and then execute all the tox tests.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
## Shell Opts ----------------------------------------------------------------
|
||||||
set -xeu
|
set -xeu
|
||||||
|
|
||||||
|
## Vars ----------------------------------------------------------------------
|
||||||
|
|
||||||
|
export WORKING_DIR=${WORKING_DIR:-$(pwd)}
|
||||||
|
|
||||||
|
## Main ----------------------------------------------------------------------
|
||||||
|
|
||||||
source /etc/os-release || source /usr/lib/os-release
|
source /etc/os-release || source /usr/lib/os-release
|
||||||
|
|
||||||
install_pkg_deps() {
|
install_pkg_deps() {
|
||||||
|
@ -41,7 +48,15 @@ install_pkg_deps() {
|
||||||
|
|
||||||
git_clone_repo() {
|
git_clone_repo() {
|
||||||
if [[ ! -d tests/common ]]; then
|
if [[ ! -d tests/common ]]; then
|
||||||
git clone https://git.openstack.org/openstack/openstack-ansible-tests tests/common
|
# 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 \
|
||||||
|
https://git.openstack.org/openstack/openstack-ansible-tests \
|
||||||
|
tests/common
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,4 +67,3 @@ git_clone_repo
|
||||||
# start executing the main test script
|
# start executing the main test script
|
||||||
source tests/common/run_tests_common.sh
|
source tests/common/run_tests_common.sh
|
||||||
|
|
||||||
# vim: set ts=4 sw=4 expandtab:
|
|
||||||
|
|
Loading…
Reference in New Issue