Merge "OCP-Router: Add Zuul experimental gates for Openshift Route"
This commit is contained in:
commit
d40fbab053
|
@ -149,3 +149,14 @@
|
||||||
KURYR_VIF_POOL_DRIVER: neutron
|
KURYR_VIF_POOL_DRIVER: neutron
|
||||||
KURYR_K8S_SERIAL_TESTS: True
|
KURYR_K8S_SERIAL_TESTS: True
|
||||||
tempest_concurrency: 1
|
tempest_concurrency: 1
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: kuryr-kubernetes-tempest-daemon-openshift-octavia-ingress
|
||||||
|
parent: kuryr-kubernetes-tempest-daemon-openshift-octavia
|
||||||
|
description: |
|
||||||
|
Kuryr-Kubernetes tempest job using octavia, ingress controller and OpenShift
|
||||||
|
vars:
|
||||||
|
devstack_localrc:
|
||||||
|
KURYR_ENABLE_INGRESS: true
|
||||||
|
KURYR_ENABLED_HANDLERS: vif,lb,lbaasspec,ocproute,ingresslb
|
||||||
|
voting: false
|
||||||
|
|
|
@ -42,3 +42,4 @@
|
||||||
- kuryr-kubernetes-tempest-daemon-containerized-octavia-namespace
|
- kuryr-kubernetes-tempest-daemon-containerized-octavia-namespace
|
||||||
- kuryr-kubernetes-tempest-daemon-containerized-openshift-octavia-serial
|
- kuryr-kubernetes-tempest-daemon-containerized-openshift-octavia-serial
|
||||||
- kuryr-kubernetes-tempest-daemon-ovn
|
- kuryr-kubernetes-tempest-daemon-ovn
|
||||||
|
- kuryr-kubernetes-tempest-daemon-openshift-octavia-ingress
|
||||||
|
|
|
@ -763,6 +763,11 @@ function create_ingress_l7_router {
|
||||||
lb_uuid="$(get_loadbalancer_attribute "$lb_name" "id")"
|
lb_uuid="$(get_loadbalancer_attribute "$lb_name" "id")"
|
||||||
iniset "$KURYR_CONFIG" ingress l7_router_uuid "$lb_uuid"
|
iniset "$KURYR_CONFIG" ingress l7_router_uuid "$lb_uuid"
|
||||||
|
|
||||||
|
#in case tempest enabled, update router's FIP in tempest.conf
|
||||||
|
if is_service_enabled tempest; then
|
||||||
|
iniset $TEMPEST_CONFIG kuryr_kubernetes ocp_router_fip "$l7_router_fip"
|
||||||
|
fi
|
||||||
|
|
||||||
if is_service_enabled octavia; then
|
if is_service_enabled octavia; then
|
||||||
echo -n "Octavia: no need to create fake k8s service for Ingress."
|
echo -n "Octavia: no need to create fake k8s service for Ingress."
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue