Update functional test definitions

Change-Id: Ie537b0c6ff56875e7f82e63c8aeaa2a3c464f8f7

src/tests/bundles/bionic-rocky-functional.yaml

@@ -10,7 +10,12 @@ applications:
     charm: cs:~openstack-charmers-next/bionic/keystone
     constraints: mem=1G
     num_units: 1
-    options: {openstack-origin: 'cloud:bionic-rocky'}
+    options:
+        openstack-origin: 'cloud:bionic-rocky'
+        haproxy-server-timeout: 90000
+        haproxy-client-timeout: 90000
+        haproxy-queue-timeout: 9000
+        haproxy-connect-timeout: 9000
     series: bionic
   mysql:
     charm: cs:~openstack-charmers-next/bionic/percona-cluster
@@ -22,7 +27,14 @@ applications:
     charm: cs:~openstack-charmers-next/bionic/neutron-api
     constraints: mem=1G
     num_units: 1
-    options: {flat-network-providers: physnet1, neutron-security-groups: true, openstack-origin: 'cloud:bionic-rocky'}
+    options:
+        flat-network-providers: physnet1,
+        neutron-security-groups: true
+        openstack-origin: 'cloud:bionic-rocky'
+        haproxy-server-timeout: 90000
+        haproxy-client-timeout: 90000
+        haproxy-queue-timeout: 9000
+        haproxy-connect-timeout: 9000
     series: bionic
   neutron-dynamic-routing:
     charm: ../../../neutron-dynamic-routing
@@ -39,4 +51,3 @@ applications:
     charm: cs:~openstack-charmers-next/bionic/quagga
     num_units: 1
     series: bionic
-

src/tests/bundles/cosmic-rocky-functional.yaml

@@ -11,6 +11,11 @@ applications:
     charm: cs:~openstack-charmers-next/bionic/keystone
     constraints: mem=1G
     num_units: 1
+    options:
+        haproxy-server-timeout: 90000
+        haproxy-client-timeout: 90000
+        haproxy-queue-timeout: 9000
+        haproxy-connect-timeout: 9000
     series: cosmic
   mysql:
     charm: cs:~openstack-charmers-next/bionic/percona-cluster
@@ -21,7 +26,13 @@ applications:
     charm: cs:~openstack-charmers-next/bionic/neutron-api
     constraints: mem=1G
     num_units: 1
-    options: {flat-network-providers: physnet1, neutron-security-groups: true}
+    options:
+        flat-network-providers: physnet1
+        neutron-security-groups: true
+        haproxy-server-timeout: 90000
+        haproxy-client-timeout: 90000
+        haproxy-queue-timeout: 9000
+        haproxy-connect-timeout: 9000
     series: cosmic
   neutron-dynamic-routing:
     charm: ../../../neutron-dynamic-routing

src/tests/tests.yaml

@@ -2,9 +2,9 @@ charm_name: neutron-dynamic-routing
 configure:
 - zaza.charm_tests.dragent.configure.setup
 dev_bundles:
-- bionic-rocky-functional
 - cosmic-rocky-functional
 gate_bundles:
+- bionic-rocky-functional
 - bionic-queens-functional
 - xenial-pike-functional
 - xenial-queens-functional