diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index d9dce59c49..0853ba37b9 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -471,7 +471,12 @@ fi # For feature/qos branch, actually enable qos service plugin if [[ "$BRANCH_OVERRIDE" =~ ^feature/qos$ ]] || [[ "$ZUUL_BRANCH" =~ ^feature/qos$ ]] ; then + # enable qos service plugin export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos" + # also enable qos ml2 extension driver + export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]" + # port_security is enabled by default + export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos" fi cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh @@ -1121,7 +1126,12 @@ fi # For feature/qos branch, actually enable qos service plugin if [[ "$BRANCH_OVERRIDE" =~ ^feature/qos$ ]] || [[ "$ZUUL_BRANCH" =~ ^feature/qos$ ]] ; then + # enable qos service plugin export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos" + # also enable qos ml2 extension driver + export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]" + # port_security is enabled by default + export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos" fi cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml index b260a9799c..923c736036 100644 --- a/jenkins/jobs/neutron.yaml +++ b/jenkins/jobs/neutron.yaml @@ -26,7 +26,12 @@ fi # For feature/qos branch, actually enable qos service plugin if [[ "$BRANCH_OVERRIDE" =~ ^feature/qos$ ]] || [[ "$ZUUL_BRANCH" =~ ^feature/qos$ ]] ; then + # enable qos service plugin export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos" + # also enable qos ml2 extension driver + export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]" + # port_security is enabled by default + export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos" fi function gate_hook {{ @@ -81,7 +86,12 @@ fi # For feature/qos branch, actually enable qos service plugin if [[ "$BRANCH_OVERRIDE" =~ ^feature/qos$ ]] || [[ "$ZUUL_BRANCH" =~ ^feature/qos$ ]] ; then + # enable qos service plugin export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos" + # also enable qos ml2 extension driver + export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]" + # port_security is enabled by default + export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos" fi cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh @@ -266,7 +276,12 @@ fi # For feature/qos branch, actually enable qos service plugin if [[ "$BRANCH_OVERRIDE" =~ ^feature/qos$ ]] || [[ "$ZUUL_BRANCH" =~ ^feature/qos$ ]] ; then - export DEVSTACK_LOCAL_CONFIG+="Q_SERVICE_PLUGIN_CLASSES=qos" + # enable qos service plugin + export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos" + # also enable qos ml2 extension driver + export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]" + # port_security is enabled by default + export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos" fi cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh