Enable Octavia Variant
This commit creates a new gate for kuryr-kubernetes using Octavia and splits the pipeline in two different variants. Change-Id: I2f8d01131a62fe2f3741b6e422d40d76f109a4c2 Signed-off-by: Daniel Mellado <dmellado@redhat.com>
This commit is contained in:
Daniel Mellado
parent
9d3a8ce858
commit
c2ab69f303
|
|
@ -91,7 +91,7 @@
|
|||
- console-log
|
||||
|
||||
- job-template:
|
||||
name: '{pipeline}-tempest-dsvm-kuryr-kubernetes-{node}{suffix}'
|
||||
name: '{pipeline}-tempest-dsvm-lbaasv2-kuryr-kubernetes-{node}{suffix}'
|
||||
node: '{node}'
|
||||
|
||||
wrappers:
|
||||
|
|
@ -117,25 +117,25 @@
|
|||
enable_service q-dhcp
|
||||
enable_service q-l3
|
||||
enable_service q-svc
|
||||
# LBaaSv2 service and Haproxy agent
|
||||
enable_plugin neutron-lbaas \
|
||||
git://git.openstack.org/openstack/neutron-lbaas
|
||||
enable_service q-lbaasv2
|
||||
NEUTRON_LBAAS_SERVICE_PROVIDERV2="LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default"
|
||||
# Keystone
|
||||
enable_service key
|
||||
# dependencies
|
||||
enable_service mysql
|
||||
enable_service rabbit
|
||||
# Nova
|
||||
enable_service n-api-meta
|
||||
enable_service n-api
|
||||
enable_service n-cauth
|
||||
enable_service n-cond
|
||||
enable_service n-cpu
|
||||
enable_service n-novnc
|
||||
enable_service n-cond
|
||||
enable_service n-sch
|
||||
enable_service placement-api
|
||||
enable_service placement-client
|
||||
# Glance
|
||||
enable_service g-api
|
||||
enable_service g-reg
|
||||
# Cinder
|
||||
enable_service c-api
|
||||
enable_service c-vol
|
||||
enable_service c-sch
|
||||
# Docker
|
||||
enable_plugin devstack-plugin-container \
|
||||
git://git.openstack.org/openstack/devstack-plugin-container
|
||||
|
|
@ -150,6 +150,104 @@
|
|||
enable_service kubelet
|
||||
# Kuryr watcher
|
||||
enable_service kuryr-kubernetes
|
||||
# LBaaSv2 service and Haproxy agent
|
||||
enable_plugin neutron-lbaas git://git.openstack.org/openstack/neutron-lbaas
|
||||
NEUTRON_LBAAS_SERVICE_PROVIDERV2=LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
|
||||
ENABLED_SERVICES+=,q-lbaasv2
|
||||
# Enable Tempest
|
||||
enable_service tempest
|
||||
# Enable Tempest plugin
|
||||
TEMPEST_PLUGINS='/opt/stack/new/kuryr-tempest-plugin'
|
||||
- shell: |
|
||||
#!/bin/bash -xe
|
||||
export PYTHONUNBUFFERED=true
|
||||
export DEVSTACK_GATE_TEMPEST=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX="kuryr_tempest_plugin.tests"
|
||||
export BRANCH_OVERRIDE={branch-override}
|
||||
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
|
||||
export PROJECTS="openstack/kuryr-kubernetes $PROJECTS"
|
||||
export PROJECTS="openstack/kuryr-tempest-plugin $PROJECTS"
|
||||
export PROJECTS="openstack/devstack-plugin-container $PROJECTS"
|
||||
|
||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||
./safe-devstack-vm-gate-wrap.sh
|
||||
|
||||
publishers:
|
||||
- test-results
|
||||
- devstack-logs
|
||||
- console-log
|
||||
|
||||
- job-template:
|
||||
name: '{pipeline}-tempest-dsvm-octavia-kuryr-kubernetes-{node}{suffix}'
|
||||
node: '{node}'
|
||||
|
||||
wrappers:
|
||||
- build-timeout:
|
||||
timeout: 125
|
||||
- timestamps
|
||||
|
||||
builders:
|
||||
- print-template-name:
|
||||
template-name: "{template-name}"
|
||||
- link-logs
|
||||
- net-info
|
||||
- devstack-checkout
|
||||
- local_conf:
|
||||
conf: |
|
||||
[[local|localrc]]
|
||||
enable_plugin kuryr-kubernetes \
|
||||
https://git.openstack.org/openstack/kuryr-kubernetes
|
||||
ENABLED_SERVICES=""
|
||||
# Neutron services
|
||||
enable_service neutron
|
||||
enable_service q-agt
|
||||
enable_service q-dhcp
|
||||
enable_service q-l3
|
||||
enable_service q-svc
|
||||
# Keystone
|
||||
enable_service key
|
||||
# dependencies
|
||||
enable_service mysql
|
||||
enable_service rabbit
|
||||
# Nova
|
||||
enable_service n-api
|
||||
enable_service n-cpu
|
||||
enable_service n-cond
|
||||
enable_service n-sch
|
||||
enable_service placement-api
|
||||
enable_service placement-client
|
||||
# Glance
|
||||
enable_service g-api
|
||||
enable_service g-reg
|
||||
# Cinder
|
||||
enable_service c-api
|
||||
enable_service c-vol
|
||||
enable_service c-sch
|
||||
# Docker
|
||||
enable_plugin devstack-plugin-container \
|
||||
git://git.openstack.org/openstack/devstack-plugin-container
|
||||
# Etcd
|
||||
enable_service etcd3
|
||||
# Kubernetes
|
||||
enable_service kubernetes-api
|
||||
enable_service kubernetes-controller-manager
|
||||
enable_service kubernetes-scheduler
|
||||
KURYR_K8S_API_PORT="8080"
|
||||
# Kubelet
|
||||
enable_service kubelet
|
||||
# Kuryr watcher
|
||||
enable_service kuryr-kubernetes
|
||||
# LBaaSv2 service and Octavia
|
||||
LIBS_FROM_GIT+=python-octaviaclient
|
||||
enable_plugin neutron-lbaas git://git.openstack.org/openstack/neutron-lbaas
|
||||
enable_plugin octavia https://git.openstack.org/openstack/octavia
|
||||
enable_plugin barbican https://git.openstack.org/openstack/barbican
|
||||
ENABLED_SERVICES+=,q-lbaasv2,octavia,o-api,o-cw,o-hk,o-hm
|
||||
# Enable Tempest
|
||||
enable_service tempest
|
||||
# Enable Tempest plugin
|
||||
|
|
|
|||
|
|
@ -6460,7 +6460,12 @@
|
|||
suffix: '-nv'
|
||||
variant: 'dragonflow'
|
||||
branch-override: default
|
||||
- '{pipeline}-tempest-dsvm-kuryr-kubernetes-{node}{suffix}':
|
||||
- '{pipeline}-tempest-dsvm-lbaasv2-kuryr-kubernetes-{node}{suffix}':
|
||||
pipeline: gate
|
||||
node: ubuntu-xenial
|
||||
suffix: '-nv'
|
||||
branch-override: default
|
||||
- '{pipeline}-tempest-dsvm-octavia-kuryr-kubernetes-{node}{suffix}':
|
||||
pipeline: gate
|
||||
node: ubuntu-xenial
|
||||
suffix: '-nv'
|
||||
|
|
|
|||
|
|
@ -11268,11 +11268,12 @@ projects:
|
|||
check:
|
||||
- gate-install-dsvm-default-kuryr-kubernetes
|
||||
- gate-install-dsvm-dragonflow-kuryr-kubernetes-nv
|
||||
- gate-tempest-dsvm-kuryr-kubernetes-ubuntu-xenial-nv
|
||||
- gate-tempest-dsvm-lbaasv2-kuryr-kubernetes-ubuntu-xenial-nv
|
||||
gate:
|
||||
- gate-install-dsvm-default-kuryr-kubernetes
|
||||
experimental:
|
||||
- gate-tempest-dsvm-kuryr-kubernetes-multinode-ubuntu-xenial-nv
|
||||
- gate-tempest-dsvm-octavia-kuryr-kubernetes-ubuntu-xenial-nv
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue