X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=6bf20ef51d15a72c106837e341885cdb954c831a;hb=5c1de065add30cd38c3bdfe0805b7778b2c356cb;hp=920ba0adf60d755f875da9d87526e768c5a61c8d;hpb=9d93c87f59dd97c5cbd44f6b75e6a45bd0fe97eb;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 920ba0adf..6bf20ef51 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -384,7 +384,6 @@
       - patrole_admin
       - patrole_member
       - patrole_reader
-      - neutron_trunk
       - networking-bgpvpn
       - networking-sfc
       - tempest_barbican
@@ -393,8 +392,6 @@
     exclude:
       - tag: latest
         test: refstack_defcore
-      - tag: latest
-        test: neutron_trunk
       - tag: latest
         test: networking-bgpvpn
       - tag: latest
@@ -403,8 +400,6 @@
         test: patrole
       - tag: kali
         test: refstack_defcore
-      - tag: kali
-        test: neutron_trunk
       - tag: kali
         test: networking-bgpvpn
       - tag: kali
@@ -417,8 +412,6 @@
         test: patrole_reader
       - tag: jerma
         test: refstack_defcore
-      - tag: jerma
-        test: neutron_trunk
       - tag: jerma
         test: networking-bgpvpn
       - tag: jerma
@@ -433,8 +426,6 @@
         test: tempest_cyborg
       - tag: iruya
         test: refstack_defcore
-      - tag: iruya
-        test: neutron_trunk
       - tag: iruya
         test: patrole_admin
       - tag: iruya
@@ -451,8 +442,6 @@
         test: refstack_platform
       - tag: hunter
         test: tempest_octavia
-      - tag: hunter
-        test: neutron_trunk
       - tag: hunter
         test: tempest_telemetry
       - tag: hunter
@@ -465,8 +454,6 @@
         test: tempest_cyborg
       - tag: arm64-latest
         test: refstack_defcore
-      - tag: arm64-latest
-        test: neutron_trunk
       - tag: arm64-latest
         test: networking-bgpvpn
       - tag: arm64-latest
@@ -475,8 +462,6 @@
         test: patrole
       - tag: arm64-kali
         test: refstack_defcore
-      - tag: arm64-kali
-        test: neutron_trunk
       - tag: arm64-kali
         test: networking-bgpvpn
       - tag: arm64-kali
@@ -489,8 +474,6 @@
         test: patrole_reader
       - tag: arm64-jerma
         test: refstack_defcore
-      - tag: arm64-jerma
-        test: neutron_trunk
       - tag: arm64-jerma
         test: networking-bgpvpn
       - tag: arm64-jerma
@@ -505,8 +488,6 @@
         test: tempest_cyborg
       - tag: arm64-iruya
         test: refstack_defcore
-      - tag: arm64-iruya
-        test: neutron_trunk
       - tag: arm64-iruya
         test: patrole_admin
       - tag: arm64-iruya
@@ -523,8 +504,6 @@
         test: refstack_platform
       - tag: arm64-hunter
         test: tempest_octavia
-      - tag: arm64-hunter
-        test: neutron_trunk
       - tag: arm64-hunter
         test: tempest_telemetry
       - tag: arm64-hunter
@@ -686,7 +665,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest(-ovn)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$'
+            - '^functest(-pi)?(-ovn)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$'
     builders:
       - multijob:
           name: remove former images
@@ -784,8 +763,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole_reader-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run'
@@ -1054,7 +1031,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest(-ovn)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$'
+            - '^functest(-pi)?(-ovn)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$'
     builders:
       - multijob:
           name: remove former images
@@ -1175,8 +1152,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole_reader-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run'
@@ -1285,7 +1260,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest(-ovn)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$'
+            - '^functest(-pi)?(-ovn)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$'
     builders:
       - multijob:
           name: remove former images
@@ -1406,8 +1381,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole_reader-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run'