Updated from OpenStack Ansible Tests

Change-Id: I159b269f2cad4a4da0dc9be65e4a1b132a830430
This commit is contained in:
OpenStack Proposal Bot 2017-06-22 15:20:22 +00:00
parent de8cef8ec8
commit 494daaf5d6
3 changed files with 36 additions and 4 deletions

3
.gitignore vendored
View File

@ -67,4 +67,5 @@ tests/*.retry
# Vagrant artifacts
.vagrant
# Git clones
openstack-ansible-ops

9
Vagrantfile vendored
View File

@ -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|
config.vm.provider "virtualbox" do |v|
v.memory = 2048
@ -12,6 +20,7 @@ Vagrant.configure(2) do |config|
SHELL
config.vm.define "ubuntu1604" do |xenial|
xenial.disksize.size = "40GB"
xenial.vm.box = "ubuntu/xenial64"
end

View File

@ -12,9 +12,24 @@
# 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.
#
## Shell Opts ----------------------------------------------------------------
set -xeu
## Vars ----------------------------------------------------------------------
export WORKING_DIR=${WORKING_DIR:-$(pwd)}
## Main ----------------------------------------------------------------------
source /etc/os-release || source /usr/lib/os-release
install_pkg_deps() {
@ -33,7 +48,15 @@ install_pkg_deps() {
git_clone_repo() {
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
}
@ -42,6 +65,5 @@ install_pkg_deps
git_clone_repo
# start executing the main test script
source tests/common/run_tests.sh
source tests/common/run_tests_common.sh
# vim: set ts=4 sw=4 expandtab: