Merge "Restore octavia to DevStack jobs"

zuul.d/tobiko-devstack.yaml

@@ -1,5 +1,5 @@
 - job:
-    name: tobiko-devstack
+    name: tobiko-devstack-base
     parent: devstack
     abstract: true
     nodeset: openstack-single-node
@@ -89,7 +89,7 @@
 
 - job:
     name: tobiko-devstack-octavia
-    parent: tobiko-devstack
+    parent: tobiko-devstack-base
     abstract: true
     nodeset: openstack-single-node
     description: |
@@ -129,6 +129,12 @@
         yml: true
 
 
+- job:
+    name: tobiko-devstack
+    parent: tobiko-devstack-octavia
+    abstract: true
+
+
 - job:
     name: tobiko-devstack-functional
     parent: tobiko-devstack