Merge "Update amphorav2 jobs"

Author: Zuul

zuul.d/jobs.yaml

@@ -94,31 +94,11 @@
       grenade_from_branch: stable/stein
 
 - job:
-    name: octavia-v2-dsvm-scenario-amphora-v2
+    name: octavia-v2-dsvm-scenario-jobboard
     parent: octavia-v2-dsvm-scenario
     vars:
       devstack_localrc:
         OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD: True
-      devstack_local_conf:
-        post-config:
-          $OCTAVIA_CONF:
-            api_settings:
-              default_provider_driver: amphorav2
-              enabled_provider_drivers: amphorav2:The v2 amphora driver.
-            task_flow:
-              jobboard_expiration_time: 100
-        test-config:
-          "$TEMPEST_CONFIG":
-            load_balancer:
-              enabled_provider_drivers: amphorav2:The v2 amphora driver.
-              provider: amphorav2
-
-- job:
-    name: octavia-v2-dsvm-scenario-amphora-v2-no-jobboard
-    parent: octavia-v2-dsvm-scenario-amphora-v2
-    vars:
-      devstack_localrc:
-        OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD: False
 
 - project-template:
     name: octavia-tox-tips

zuul.d/projects.yaml

@@ -53,6 +53,8 @@
               - ^releasenotes/.*$
         - octavia-v2-dsvm-scenario:
             irrelevant-files: *irrelevant-files
+        - octavia-v2-dsvm-scenario-jobboard:
+            irrelevant-files: *irrelevant-files
         - octavia-v2-dsvm-tls-barbican:
             irrelevant-files: *irrelevant-files
         - octavia-grenade:
@@ -81,12 +83,6 @@
         - octavia-v2-dsvm-scenario-ipv6-only:
             irrelevant-files: *irrelevant-files
             voting: false
-        - octavia-v2-dsvm-scenario-amphora-v2:
-            irrelevant-files: *irrelevant-files
-            voting: false
-        - octavia-v2-dsvm-scenario-amphora-v2-no-jobboard:
-            irrelevant-files: *irrelevant-files
-            voting: false
         - octavia-v2-dsvm-scenario-centos-9-stream:
             irrelevant-files: *irrelevant-files
             voting: false
@@ -128,9 +124,3 @@
     experimental:
       jobs:
         - octavia-v2-dsvm-scenario-nftables
-        - octavia-v2-dsvm-noop-api-amphora-v2
-        - octavia-v2-dsvm-tls-barbican-amphora-v2
-        - octavia-v2-act-stdby-dsvm-scenario-amphora-v2
-        - octavia-grenade-amphora-v2
-        - octavia-v2-dsvm-cinder-amphora-v2
-        - octavia-v2-dsvm-scenario-two-node-amphora-v2