commit 59ec77d69d47411132569b2333726055351a750f
author Zuul <zuul@review.opendev.org> Wed Mar 10 11:07:07 2021 +0000
committer Gerrit Code Review <review@openstack.org> Wed Mar 10 11:07:07 2021 +0000
tree 0d772551447fac0170f2ddf664447ed6abb079bb
parent 3ff105bb5d84a05269f8e42918cd49ca4a80b23d
parent 0f7e0283e98268e8f652753f8f02186069647adc

Merge "Add neutron plugin to octavia-dsvm-base job"

zuul.d/jobs.yaml

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 2753923..b37636a 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -115,6 +115,7 @@
       devstack_plugins:
         octavia: https://opendev.org/openstack/octavia.git
         octavia-tempest-plugin: https://opendev.org/openstack/octavia-tempest-plugin.git
+        neutron: https://opendev.org/openstack/neutron.git
       tempest_plugins:
         - octavia-tempest-plugin
 
@@ -171,6 +172,7 @@
       devstack_plugins:
         octavia: https://opendev.org/openstack/octavia.git
         octavia-tempest-plugin: https://opendev.org/openstack/octavia-tempest-plugin.git
+        neutron: https://opendev.org/openstack/neutron.git
       tempest_plugins:
         - octavia-tempest-plugin
 
@@ -205,8 +207,6 @@
               not_implemented_is_error: True
       devstack_services:
         neutron-qos: true
-      devstack_plugins:
-        neutron: https://opendev.org/openstack/neutron.git
       zuul_copy_output:
         '/var/log/dib-build' : logs
         '/var/log/octavia-amphora.log': logs
@@ -239,8 +239,6 @@
               check_timeout: 180
       devstack_services:
         neutron-qos: true
-      devstack_plugins:
-        neutron: https://opendev.org/openstack/neutron.git
       zuul_copy_output:
         '/var/log/dib-build' : logs
         '/var/log/octavia-amphora.log': logs