Add Zun scenario job for ubuntu

Introduce a job 'kolla-ansible-ubuntu-source-zun' to test kolla
with Zun enabled. To reduce CI resource, this job will be triggered
only if there are changes on the Zun's ansible roles.

Change-Id: I0ba207e1d3761da2d6992c5834d4f59e7e1d6628
This commit is contained in:
Hongbin LU 2018-04-30 15:17:27 +00:00 committed by Hongbin Lu
parent fed5b71b64
commit f57c1aec6c
6 changed files with 35 additions and 0 deletions

View File

@ -113,3 +113,4 @@ base_url = ws://{{ kolla_external_fqdn }}:{{ zun_wsproxy_port }}
[docker] [docker]
docker_remote_api_version = 1.24 docker_remote_api_version = 1.24
api_url = tcp://{{ api_interface_address }}:2375

View File

@ -44,4 +44,10 @@ ceph_pool_pg_num: 8
ceph_pool_pgp_num: 8 ceph_pool_pgp_num: 8
{% endif %} {% endif %}
{% if scenario == "zun" %}
enable_zun: "yes"
enable_kuryr: "yes"
docker_custom_option: " -H unix:///var/run/docker.sock -H tcp://{{ api_interface_address }}:2375"
{% endif %}
keystone_token_provider: "fernet" keystone_token_provider: "fernet"

View File

@ -601,6 +601,9 @@ placement
[zun-api:children] [zun-api:children]
zun zun
[zun-wsproxy:children]
zun
[zun-compute:children] [zun-compute:children]
compute compute

View File

@ -44,6 +44,10 @@ EOF
GATE_IMAGES+=",ceph,cinder" GATE_IMAGES+=",ceph,cinder"
fi fi
if [[ $ACTION == "zun" ]]; then
GATE_IMAGES+=",zun,kuryr"
fi
cat <<EOF | sudo tee /etc/kolla/kolla-build.conf cat <<EOF | sudo tee /etc/kolla/kolla-build.conf
[DEFAULT] [DEFAULT]
include_header = /etc/kolla/header include_header = /etc/kolla/header
@ -87,6 +91,9 @@ function setup_ansible {
# TODO(SamYaple): Move to virtualenv # TODO(SamYaple): Move to virtualenv
sudo -H pip install -U "ansible>=2.4" "docker>=2.0.0" "python-openstackclient" "ara" "cmd2<0.9.0" sudo -H pip install -U "ansible>=2.4" "docker>=2.0.0" "python-openstackclient" "ara" "cmd2<0.9.0"
if [[ $ACTION == "zun" ]]; then
sudo -H pip install -U "python-zunclient"
fi
detect_distro detect_distro
sudo mkdir /etc/ansible sudo mkdir /etc/ansible
@ -135,6 +142,12 @@ function sanity_check {
openstack volume create --size 2 test_volume openstack volume create --size 2 test_volume
openstack server add volume kolla_boot_test test_volume --device /dev/vdb openstack server add volume kolla_boot_test test_volume --device /dev/vdb
fi fi
if echo $ACTION | grep -q "zun"; then
openstack --debug appcontainer service list
openstack --debug appcontainer host list
# TODO(hongbin): Run a Zun container and assert the container becomes
# Running
fi
} }
function test_openstack { function test_openstack {

View File

@ -88,3 +88,13 @@
voting: false voting: false
vars: vars:
base_distro: centos base_distro: centos
- job:
name: kolla-ansible-ubuntu-source-zun
parent: kolla-ansible-base
nodeset: kolla-ansible-xenial
voting: false
vars:
base_distro: ubuntu
install_type: source
scenario: zun

View File

@ -18,6 +18,8 @@
- kolla-ansible-oraclelinux-source-ceph - kolla-ansible-oraclelinux-source-ceph
- kolla-ansible-bifrost-centos-source: - kolla-ansible-bifrost-centos-source:
files: ^ansible\/roles\/bifrost\/.* files: ^ansible\/roles\/bifrost\/.*
- kolla-ansible-ubuntu-source-zun:
files: ^ansible\/roles\/zun\/.*
- openstack-tox-lower-constraints - openstack-tox-lower-constraints
gate: gate:
jobs: jobs: