Merge "Fill the tests directory"
This commit is contained in:
commit
9a9f5971c3
@ -135,7 +135,7 @@ heat_service_adminurl: "{{ tacker_service_publicuri_proto }}://{{ external_lb_vi
|
|||||||
#NOTE: these default should be updated approprietly
|
#NOTE: these default should be updated approprietly
|
||||||
# tacker-horizon uses this
|
# tacker-horizon uses this
|
||||||
tackerclient_git_url: https://github.com/openstack/python-tackerclient.git
|
tackerclient_git_url: https://github.com/openstack/python-tackerclient.git
|
||||||
tacker_git_branch: "stable/liberty"
|
tacker_git_branch: "master"
|
||||||
|
|
||||||
# tacker horizon vars
|
# tacker horizon vars
|
||||||
tacker_horizon_venv: "/openstack/venvs/horizon-{{ openstack_release }}"
|
tacker_horizon_venv: "/openstack/venvs/horizon-{{ openstack_release }}"
|
||||||
|
@ -410,7 +410,7 @@ default_vim = VIM0
|
|||||||
#openstack = /etc/tacker/vim/fernet_keys
|
#openstack = /etc/tacker/vim/fernet_keys
|
||||||
[tacker_nova]
|
[tacker_nova]
|
||||||
# parameters for novaclient to talk to nova
|
# parameters for novaclient to talk to nova
|
||||||
region_name = {{ service_region }}
|
region_name = {{ tacker_service_region }}
|
||||||
project_domain_id = {{ nova_service_project_domain_id }}
|
project_domain_id = {{ nova_service_project_domain_id }}
|
||||||
project_name = {{ nova_service_project_name }}
|
project_name = {{ nova_service_project_name }}
|
||||||
user_domain_id = {{ nova_service_user_domain_id }}
|
user_domain_id = {{ nova_service_user_domain_id }}
|
||||||
|
26
tests/group_vars/all_containers.yml
Normal file
26
tests/group_vars/all_containers.yml
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
---
|
||||||
|
# Copyright 2016, Rackspace US, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
container_name: "{{ inventory_hostname }}"
|
||||||
|
container_networks:
|
||||||
|
management_address:
|
||||||
|
address: "{{ ansible_host }}"
|
||||||
|
bridge: "br-mgmt"
|
||||||
|
interface: "eth1"
|
||||||
|
netmask: "255.255.255.0"
|
||||||
|
type: "veth"
|
||||||
|
physical_host: localhost
|
||||||
|
properties:
|
||||||
|
service_name: "{{ inventory_hostname }}"
|
18
tests/host_vars/infra1.yml
Normal file
18
tests/host_vars/infra1.yml
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
---
|
||||||
|
# Copyright 2016, Rackspace US, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
ansible_host: 10.1.0.2
|
||||||
|
ansible_become: True
|
||||||
|
ansible_user: root
|
19
tests/host_vars/localhost.yml
Normal file
19
tests/host_vars/localhost.yml
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
---
|
||||||
|
# Copyright 2016, Rackspace US, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
bridges:
|
||||||
|
- "br-mgmt"
|
||||||
|
|
||||||
|
ansible_python_interpreter: "/usr/bin/python2"
|
18
tests/host_vars/tacker1.yml
Normal file
18
tests/host_vars/tacker1.yml
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
---
|
||||||
|
# Copyright 2017, SUSE Linux GmbH
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
ansible_host: 10.1.0.3
|
||||||
|
ansible_become: True
|
||||||
|
ansible_user: root
|
@ -1 +1,34 @@
|
|||||||
|
[all]
|
||||||
localhost
|
localhost
|
||||||
|
infra1
|
||||||
|
tacker1
|
||||||
|
|
||||||
|
[all_containers]
|
||||||
|
infra1
|
||||||
|
tacker1
|
||||||
|
|
||||||
|
[rabbitmq_all]
|
||||||
|
infra1
|
||||||
|
|
||||||
|
[galera_all]
|
||||||
|
infra1
|
||||||
|
|
||||||
|
[memcached_all]
|
||||||
|
infra1
|
||||||
|
|
||||||
|
[service_all:children]
|
||||||
|
rabbitmq_all
|
||||||
|
galera_all
|
||||||
|
memcached_all
|
||||||
|
|
||||||
|
[keystone_all]
|
||||||
|
infra1
|
||||||
|
|
||||||
|
[tacker_all]
|
||||||
|
tacker1
|
||||||
|
|
||||||
|
[utility_all]
|
||||||
|
tacker1
|
||||||
|
|
||||||
|
[tacker_all]
|
||||||
|
tacker1
|
||||||
|
30
tests/os_tacker-overrides.yml
Normal file
30
tests/os_tacker-overrides.yml
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
---
|
||||||
|
# Copyright 2017, SUSE LINUX GmbH
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
tacker_service_tenant_name: service
|
||||||
|
tacker_rabbitmq_port: "{{ rabbitmq_port }}"
|
||||||
|
tacker_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
|
||||||
|
tacker_rabbitmq_servers: "{{ rabbitmq_servers }}"
|
||||||
|
tacker_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
|
||||||
|
tacker_service_publicuri: "{{ tacker_service_proto }}://{{ hostvars[groups['tacker_all'][0]]['ansible_host'] }}:{{ tacker_service_port }}"
|
||||||
|
tacker_service_adminurl: "{{ tacker_service_proto }}://{{ hostvars[groups['tacker_all'][0]]['ansible_host'] }}:{{ tacker_service_port }}"
|
||||||
|
tacker_service_adminuri: "{{ tacker_service_proto }}://{{ hostvars[groups['tacker_all'][0]]['ansible_host'] }}:{{ tacker_service_port }}"
|
||||||
|
tacker_aodh_enabled: false
|
||||||
|
tacker_gnocchi_enabled: false
|
||||||
|
tacker_rabbitmq_password: "secrete"
|
||||||
|
tacker_service_password: "secrete"
|
||||||
|
tacker_container_mysql_password: "secrete"
|
||||||
|
tacker_developer_mode: true
|
||||||
|
tacker_galera_address: "{{ test_galera_host }}"
|
34
tests/test-install-tacker.yml
Normal file
34
tests/test-install-tacker.yml
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
---
|
||||||
|
# Copyright 2017, SUSE Linux GmbH
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
- name: Playbook for deploying tacker
|
||||||
|
hosts: tacker_all
|
||||||
|
user: root
|
||||||
|
become: true
|
||||||
|
gather_facts: true
|
||||||
|
any_errors_fatal: true
|
||||||
|
pre_tasks:
|
||||||
|
- include: common/ensure-rabbitmq.yml
|
||||||
|
vhost_name: "{{ tacker_rabbitmq_vhost }}"
|
||||||
|
user_name: "{{ tacker_rabbitmq_userid }}"
|
||||||
|
user_password: "{{ tacker_rabbitmq_password }}"
|
||||||
|
when: "{{ groups['rabbitmq_all'] is defined }}"
|
||||||
|
- include: common/create-grant-db.yml
|
||||||
|
db_name: "{{ tacker_galera_database }}"
|
||||||
|
db_password: "{{ tacker_container_mysql_password }}"
|
||||||
|
roles:
|
||||||
|
- role: os_tacker
|
||||||
|
vars_files:
|
||||||
|
- common/test-vars.yml
|
30
tests/test-tacker-functional.yml
Normal file
30
tests/test-tacker-functional.yml
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
---
|
||||||
|
# Copyright 2016, Rackspace US, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
- name: Ensure tacker APIs are reachable
|
||||||
|
hosts: tacker_all
|
||||||
|
user: root
|
||||||
|
gather_facts: false
|
||||||
|
tasks:
|
||||||
|
- name: check tacker api
|
||||||
|
uri:
|
||||||
|
url: "http://localhost:{{ item }}"
|
||||||
|
status_code: 200
|
||||||
|
register: result
|
||||||
|
until: result.status == 200
|
||||||
|
retries: 5
|
||||||
|
delay: 10
|
||||||
|
with_items:
|
||||||
|
- 8888
|
@ -1,5 +1,29 @@
|
|||||||
---
|
---
|
||||||
- hosts: localhost
|
# Copyright 2017, SUSE Linux GmbH
|
||||||
remote_user: root
|
#
|
||||||
roles:
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
- os_tacker
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
# Setup the host
|
||||||
|
- include: common/test-setup-host.yml
|
||||||
|
|
||||||
|
# Install RabbitMQ/MariaDB
|
||||||
|
- include: common/test-install-infra.yml
|
||||||
|
|
||||||
|
# Install Keystone
|
||||||
|
- include: common/test-install-keystone.yml
|
||||||
|
|
||||||
|
# Install Tacker
|
||||||
|
- include: test-install-tacker.yml
|
||||||
|
|
||||||
|
# Test Tacker
|
||||||
|
- include: test-tacker-functional.yml
|
||||||
|
99
tests/tests-repo-clone.sh
Executable file
99
tests/tests-repo-clone.sh
Executable file
@ -0,0 +1,99 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Copyright 2017, Rackspace US, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
# PURPOSE:
|
||||||
|
# This script clones the openstack-ansible-tests repository to the
|
||||||
|
# tests/common folder in order to be able to re-use test components
|
||||||
|
# for role testing.
|
||||||
|
|
||||||
|
# WARNING:
|
||||||
|
# This file is maintained in the openstack-ansible-tests repository:
|
||||||
|
# https://git.openstack.org/cgit/openstack/openstack-ansible-tests
|
||||||
|
# If you need to change this script, then propose the change there.
|
||||||
|
# Once it merges, the change will be replicated to the other repositories.
|
||||||
|
|
||||||
|
## Shell Opts ----------------------------------------------------------------
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
## Vars ----------------------------------------------------------------------
|
||||||
|
|
||||||
|
export TESTING_HOME=${TESTING_HOME:-$HOME}
|
||||||
|
export WORKING_DIR=${WORKING_DIR:-$(pwd)}
|
||||||
|
export CLONE_UPGRADE_TESTS=${CLONE_UPGRADE_TESTS:-no}
|
||||||
|
|
||||||
|
## Functions -----------------------------------------------------------------
|
||||||
|
|
||||||
|
function create_tests_clonemap {
|
||||||
|
|
||||||
|
# Prepare the clonemap for zuul-cloner to use
|
||||||
|
cat > ${TESTING_HOME}/tests-clonemap.yaml << EOF
|
||||||
|
clonemap:
|
||||||
|
- name: openstack/openstack-ansible-tests
|
||||||
|
dest: ${WORKING_DIR}/tests/common
|
||||||
|
EOF
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
## Main ----------------------------------------------------------------------
|
||||||
|
|
||||||
|
# If zuul-cloner is present, use it so that we
|
||||||
|
# also include any dependent patches from the
|
||||||
|
# tests repo noted in the commit message.
|
||||||
|
if [[ -x /usr/zuul-env/bin/zuul-cloner ]]; then
|
||||||
|
|
||||||
|
# Prepare the clonemap for zuul-cloner to use
|
||||||
|
create_tests_clonemap
|
||||||
|
|
||||||
|
# Execute the clone
|
||||||
|
/usr/zuul-env/bin/zuul-cloner \
|
||||||
|
--cache-dir /opt/git \
|
||||||
|
--map ${TESTING_HOME}/tests-clonemap.yaml \
|
||||||
|
git://git.openstack.org \
|
||||||
|
openstack/openstack-ansible-tests
|
||||||
|
|
||||||
|
# Clean up the clonemap.
|
||||||
|
rm -f ${TESTING_HOME}/tests-clonemap.yaml
|
||||||
|
|
||||||
|
# Alternatively, use a simple git-clone. We do
|
||||||
|
# not re-clone if the directory exists already
|
||||||
|
# to prevent overwriting any local changes which
|
||||||
|
# may have been made.
|
||||||
|
elif [[ ! -d tests/common ]]; then
|
||||||
|
|
||||||
|
# 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 \
|
||||||
|
${WORKING_DIR}/tests/common
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If this test set includes an upgrade test, the
|
||||||
|
# previous stable release tests repo must also be
|
||||||
|
# cloned.
|
||||||
|
# Note:
|
||||||
|
# Dependent patches to the previous stable release
|
||||||
|
# tests repo are not supported.
|
||||||
|
if [[ "${CLONE_UPGRADE_TESTS}" == "yes" ]]; then
|
||||||
|
if [[ ! -d "${WORKING_DIR}/tests/common/previous" ]]; then
|
||||||
|
git clone -b stable/ocata \
|
||||||
|
https://git.openstack.org/openstack/openstack-ansible-tests \
|
||||||
|
${WORKING_DIR}/tests/common/previous
|
||||||
|
fi
|
||||||
|
fi
|
27
tox.ini
27
tox.ini
@ -119,27 +119,12 @@ install_command =
|
|||||||
commands =
|
commands =
|
||||||
bash -c "{toxinidir}/tests/common/test-log-collect.sh"
|
bash -c "{toxinidir}/tests/common/test-log-collect.sh"
|
||||||
|
|
||||||
# TODO(mbuil): Add functional testing
|
[testenv:functional]
|
||||||
#[testenv:functional]
|
deps =
|
||||||
## Ignore_errors is set to true so that the logs are collected at the
|
{[testenv:ansible]deps}
|
||||||
## end of the run. This will not produce a false positive. Any
|
commands =
|
||||||
## exception will be mark the run as failed and exit 1 after all of
|
bash -c "{toxinidir}/tests/tests-repo-clone.sh"
|
||||||
## the commands have been iterated through.
|
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
||||||
#ignore_errors = True
|
|
||||||
## NOTE(odyssey4me): this target does not use constraints because
|
|
||||||
## it doesn't work in OpenStack-CI yet. Once that's fixed, we can
|
|
||||||
## drop the install_command.
|
|
||||||
#install_command =
|
|
||||||
# {[testenv:func_base]install_command}
|
|
||||||
#deps =
|
|
||||||
# {[testenv:ansible]deps}
|
|
||||||
#commands =
|
|
||||||
# {[testenv:ansible]commands}
|
|
||||||
# ansible-playbook -i {toxinidir}/tests/inventory \
|
|
||||||
# -e "install_test_packages=True" \
|
|
||||||
# {toxinidir}/tests/test.yml -vvvv
|
|
||||||
# {[testenv:func_logs]commands}
|
|
||||||
|
|
||||||
|
|
||||||
[testenv:linters]
|
[testenv:linters]
|
||||||
deps =
|
deps =
|
||||||
|
Loading…
Reference in New Issue
Block a user