[neutron][stable/unmaintained] Set devstack_neutron_service to q-svc

test_extra_dhcp_opts_logs_unsupported_options fails on
devstack-tobiko-neutron jobs running on stable and unmaintained branches
because because there has been a recent change that breaks backward
compatibility:
https://review.opendev.org/c/x/tobiko/+/950526

The devstack neutron service name was hardcoded and has been made
configurable, which allows to adapt its value to the different neutron
branches.

Depends-On: I97b1ea19716e0e89cbd99ad80d1f430c11619e89

Change-Id: I1097a7e9264c67a47698a526c437df3589d79531

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.35.1
+    rev: v1.37.1
     hooks:
       - id: yamllint
         files: \.(yaml|yml)$

zuul.d/devstack-tobiko-neutron.yaml

@@ -19,7 +19,7 @@
     parent: devstack-tobiko
     voting: true
     branches:
-      regex: ^(unmaintained|stable/(xena|yoga|zed|2023\.1)).*$
+      regex: ^(unmaintained|stable).*$
       negate: true
     description: |
       Base Tobiko devstack job to execute scenario+faults+scenario test cases.
@@ -41,13 +41,32 @@
     name: devstack-tobiko-neutron
     parent: devstack-tobiko
     voting: true
-    branches: ^(unmaintained|stable/(xena|yoga|zed|2023\.1)).*$
+    branches: ^(unmaintained|stable)/(2024|2025\.1).*$
     description: |
       Base Tobiko devstack job to execute scenario+faults+scenario test cases.
-      Variant applied to stable branches xena, yoga and zed.
+      Variant applied (at this moment) to stable branches 2024.1, 2024.2 and
+      2025.1.
+    vars:
+      <<: *FAULTS_VARS
+      test_conf:
+        topology:
+          devstack_neutron_service: 'q-svc'
+    irrelevant-files: *FAULTS_IRRELEVANT_FILES
+
+- job:
+    name: devstack-tobiko-neutron
+    parent: devstack-tobiko
+    voting: true
+    branches: ^(unmaintained).*$
+    description: |
+      Base Tobiko devstack job to execute scenario+faults+scenario test cases.
+      Variant applied to unmantained branches xena, yoga and zed.
     vars:
       <<: *FAULTS_VARS
       pytest_addopts_global: "--skipregex=StatelessSecurityGroup"
+      test_conf:
+        topology:
+          devstack_neutron_service: 'q-svc'
     irrelevant-files: *FAULTS_IRRELEVANT_FILES
 
 # --- OVS jobs----------------------------------------------------------------