Fix Functest name if OVN

Change-Id: I3da531933716c627c01f73de28035defcacd5548
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

1 files changed, 226 insertions, 226 deletions

diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml
index 820167199..54da6991e 100644
--- a/jjb/functest/functest.ovn.yaml
+++ b/jjb/functest/functest.ovn.yaml
@@ -181,37 +181,37 @@
           <<: *functest-ovn-containers
 
 - project:
-    name: 'functest-ovn-opnfv-functest-ovn-healthcheck-pull'
+    name: 'functest-ovn-opnfv-functest-healthcheck-pull'
     <<: *functest-ovn-params
-    container: 'functest-ovn-healthcheck'
+    container: 'functest-healthcheck'
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-pull'
 
 - project:
-    name: 'functest-ovn-opnfv-functest-ovn-smoke-pull'
+    name: 'functest-ovn-opnfv-functest-smoke-pull'
     <<: *functest-ovn-params
-    container: 'functest-ovn-smoke'
+    container: 'functest-smoke'
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-pull'
 
 - project:
-    name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-pull'
+    name: 'functest-ovn-opnfv-functest-smoke-cntt-pull'
     <<: *functest-ovn-params
-    container: 'functest-ovn-smoke-cntt'
+    container: 'functest-smoke-cntt'
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-pull'
 
 - project:
-    name: 'functest-ovn-opnfv-functest-ovn-benchmarking-pull'
+    name: 'functest-ovn-opnfv-functest-benchmarking-pull'
     <<: *functest-ovn-params
-    container: 'functest-ovn-benchmarking'
+    container: 'functest-benchmarking'
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-pull'
 
 - project:
-    name: 'functest-ovn-opnfv-functest-ovn-vnf-pull'
+    name: 'functest-ovn-opnfv-functest-vnf-pull'
     <<: *functest-ovn-params
-    container: 'functest-ovn-vnf'
+    container: 'functest-vnf'
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-pull'
 
@@ -225,37 +225,37 @@
           <<: *functest-ovn-containers
 
 - project:
-    name: 'functest-ovn-opnfv-functest-ovn-healthcheck-rmi'
+    name: 'functest-ovn-opnfv-functest-healthcheck-rmi'
     <<: *functest-ovn-params
-    container: 'functest-ovn-healthcheck'
+    container: 'functest-healthcheck'
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-ovn-opnfv-functest-ovn-smoke-rmi'
+    name: 'functest-ovn-opnfv-functest-smoke-rmi'
     <<: *functest-ovn-params
-    container: 'functest-ovn-smoke'
+    container: 'functest-smoke'
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-rmi'
+    name: 'functest-ovn-opnfv-functest-smoke-cntt-rmi'
     <<: *functest-ovn-params
-    container: 'functest-ovn-smoke-cntt'
+    container: 'functest-smoke-cntt'
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-ovn-opnfv-functest-ovn-benchmarking-rmi'
+    name: 'functest-ovn-opnfv-functest-benchmarking-rmi'
     <<: *functest-ovn-params
-    container: 'functest-ovn-benchmarking'
+    container: 'functest-benchmarking'
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-ovn-opnfv-functest-ovn-vnf-rmi'
+    name: 'functest-ovn-opnfv-functest-vnf-rmi'
     <<: *functest-ovn-params
-    container: 'functest-ovn-vnf'
+    container: 'functest-vnf'
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-rmi'
 
@@ -275,9 +275,9 @@
           <<: *functest-ovn-run-containers
 
 - project:
-    name: 'functest-ovn-opnfv-functest-ovn-healthcheck'
+    name: 'functest-ovn-opnfv-functest-healthcheck'
     <<: *functest-ovn-params
-    container: 'functest-ovn-healthcheck'
+    container: 'functest-healthcheck'
     test:
       - connection_check
       - tenantnetwork1
@@ -299,9 +299,9 @@
       - 'functest-ovn-{repo}-{container}-{tag}-{test}-run'
 
 - project:
-    name: 'functest-ovn-opnfv-functest-ovn-smoke'
+    name: 'functest-ovn-opnfv-functest-smoke'
     <<: *functest-ovn-params
-    container: 'functest-ovn-smoke'
+    container: 'functest-smoke'
     test:
       - neutron-tempest-plugin-api
       - tempest_cinder
@@ -341,9 +341,9 @@
       - 'functest-ovn-{repo}-{container}-{tag}-{test}-run'
 
 - project:
-    name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt'
+    name: 'functest-ovn-opnfv-functest-smoke-cntt'
     <<: *functest-ovn-params
-    container: 'functest-ovn-smoke-cntt'
+    container: 'functest-smoke-cntt'
     test:
       - neutron-tempest-plugin-api
       - tempest_cinder
@@ -356,9 +356,9 @@
       - 'functest-ovn-{repo}-{container}-{tag}-{test}-run'
 
 - project:
-    name: 'functest-ovn-opnfv-functest-ovn-benchmarking'
+    name: 'functest-ovn-opnfv-functest-benchmarking'
     <<: *functest-ovn-params
-    container: 'functest-ovn-benchmarking'
+    container: 'functest-benchmarking'
     test:
       - rally_full
       - rally_jobs
@@ -368,9 +368,9 @@
       - 'functest-ovn-{repo}-{container}-{tag}-{test}-run'
 
 - project:
-    name: 'functest-ovn-opnfv-functest-ovn-vnf'
+    name: 'functest-ovn-opnfv-functest-vnf'
     <<: *functest-ovn-params
-    container: 'functest-ovn-vnf'
+    container: 'functest-vnf'
     test:
       - cloudify
       - cloudify_ims
@@ -415,7 +415,7 @@
 - project:
     name: 'functest-ovn-{tag}-zip'
     <<: *functest-ovn-params
-    container: 'functest-ovn-healthcheck'
+    container: 'functest-healthcheck'
     jobs:
       - 'functest-ovn-{tag}-zip'
 
@@ -443,136 +443,136 @@
       - multijob:
           name: remove former images
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-rmi'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-rmi'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-rmi'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rmi'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-rmi'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-rmi'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-rmi'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-rmi'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-ovn-jobs
       - multijob:
           name: pull containers
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-pull'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-pull'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-pull'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-pull'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-pull'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-pull'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-pull'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-pull'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-pull'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-pull'
               <<: *functest-ovn-jobs
       - multijob:
-          name: opnfv/functest-ovn-healthcheck:{tag}
+          name: opnfv/functest-healthcheck:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-connection_check-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-connection_check-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-tenantnetwork1-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tenantnetwork1-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-tenantnetwork2-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tenantnetwork2-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-vmready1-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vmready1-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-vmready2-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vmready2-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-singlevm1-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-singlevm1-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-singlevm2-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-singlevm2-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-vping_ssh-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vping_ssh-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-vping_userdata-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vping_userdata-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-cinder_test-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-cinder_test-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-odl-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-tempest_smoke-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-tempest_horizon-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
               <<: *functest-ovn-jobs
       - multijob:
-          name: opnfv/functest-ovn-smoke:{tag}
+          name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-tempest_cinder-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-tempest_keystone-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_keystone-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-rally_sanity-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-refstack_defcore-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-refstack_compute-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_compute-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-refstack_object-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_object-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-refstack_platform-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_platform-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-tempest_full-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-tempest_scenario-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-tempest_slow-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_slow-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-patrole-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-neutron_trunk-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-networking-bgpvpn-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-networking-sfc-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-sfc-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-barbican-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-octavia-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-octavia-run'
               <<: *functest-ovn-jobs
       - multijob:
-          name: opnfv/functest-ovn-smoke-cntt:{tag}
+          name: opnfv/functest-smoke-cntt:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-tempest_cinder-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-tempest_keystone-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-rally_sanity-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-tempest_full-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-tempest_scenario-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-tempest_slow-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
               <<: *functest-ovn-jobs
       - multijob:
-          name: opnfv/functest-ovn-benchmarking:{tag}
+          name: opnfv/functest-benchmarking:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-rally_full-run'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-rally_jobs-run'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-vmtp-run'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-shaker-run'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-ovn-jobs
       - multijob:
-          name: opnfv/functest-ovn-vnf:{tag}
+          name: opnfv/functest-vnf:{tag}
           execution-type: SEQUENTIALLY
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-cloudify-run'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-cloudify_ims-run'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify_ims-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-heat_ims-run'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-heat_ims-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-vyos_vrouter-run'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-vyos_vrouter-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-juju_epc-run'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-ovn-jobs
       - multijob:
           name: dump all campaign data
@@ -652,9 +652,9 @@
       - tag: jerma
 
 - project:
-    name: functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-build
+    name: functest-ovn-opnfv-functest-healthcheck-{tag}-build
     <<: *functest-ovn-params
-    container: functest-ovn-healthcheck
+    container: functest-healthcheck
     ref_arg: BRANCH
     path: docker/healthcheck
     jobs:
@@ -662,9 +662,9 @@
       - 'functest-ovn-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-ovn-opnfv-functest-ovn-smoke-{tag}-build
+    name: functest-ovn-opnfv-functest-smoke-{tag}-build
     <<: *functest-ovn-params
-    container: functest-ovn-smoke
+    container: functest-smoke
     ref_arg: BRANCH
     path: docker/smoke
     jobs:
@@ -672,9 +672,9 @@
       - 'functest-ovn-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-build
+    name: functest-ovn-opnfv-functest-benchmarking-{tag}-build
     <<: *functest-ovn-params
-    container: functest-ovn-benchmarking
+    container: functest-benchmarking
     ref_arg: BRANCH
     path: docker/benchmarking
     jobs:
@@ -682,9 +682,9 @@
       - 'functest-ovn-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-ovn-opnfv-functest-ovn-vnf-{tag}-build
+    name: functest-ovn-opnfv-functest-vnf-{tag}-build
     <<: *functest-ovn-params
-    container: functest-ovn-vnf
+    container: functest-vnf
     ref_arg:
     path: docker/vnf
     jobs:
@@ -692,9 +692,9 @@
       - 'functest-ovn-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-build
+    name: functest-ovn-opnfv-functest-smoke-cntt-{tag}-build
     <<: *functest-ovn-params
-    container: functest-ovn-smoke-cntt
+    container: functest-smoke-cntt
     ref_arg: BRANCH
     path: docker/smoke-cntt
     jobs:
@@ -725,15 +725,15 @@
       - multijob:
           name: remove former images
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-rmi'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-rmi'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-rmi'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rmi'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-rmi'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-rmi'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-rmi'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-rmi'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-ovn-jobs
       - multijob:
           name: remove dependencies
@@ -758,126 +758,126 @@
       - multijob:
           name: build containers
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-check'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-check'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-check'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-check'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-check'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-check'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-check'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-check'
               <<: *functest-ovn-jobs
       - multijob:
-          name: build opnfv/functest-ovn-smoke-cntt
+          name: build opnfv/functest-smoke-cntt
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-check'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-check'
               <<: *functest-ovn-jobs
       - multijob:
-          name: opnfv/functest-ovn-healthcheck:{tag}
+          name: opnfv/functest-healthcheck:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-connection_check-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-connection_check-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-tenantnetwork1-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tenantnetwork1-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-tenantnetwork2-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tenantnetwork2-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-vmready1-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vmready1-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-vmready2-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vmready2-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-singlevm1-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-singlevm1-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-singlevm2-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-singlevm2-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-vping_ssh-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vping_ssh-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-vping_userdata-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vping_userdata-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-cinder_test-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-cinder_test-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-odl-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-tempest_smoke-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-tempest_horizon-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
               <<: *functest-ovn-jobs
       - multijob:
-          name: opnfv/functest-ovn-smoke:{tag}
+          name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-tempest_cinder-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-tempest_keystone-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_keystone-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-rally_sanity-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-refstack_defcore-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-refstack_compute-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_compute-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-refstack_object-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_object-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-refstack_platform-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_platform-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-tempest_full-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-tempest_scenario-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-tempest_slow-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_slow-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-patrole-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-neutron_trunk-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-networking-bgpvpn-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-networking-sfc-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-sfc-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-barbican-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-octavia-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-octavia-run'
               <<: *functest-ovn-jobs
       - multijob:
-          name: opnfv/functest-ovn-smoke-cntt:{tag}
+          name: opnfv/functest-smoke-cntt:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-tempest_cinder-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-tempest_keystone-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-rally_sanity-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-tempest_full-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-tempest_scenario-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-tempest_slow-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
               <<: *functest-ovn-jobs
       - multijob:
-          name: opnfv/functest-ovn-benchmarking:{tag}
+          name: opnfv/functest-benchmarking:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-rally_full-run'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-rally_jobs-run'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-vmtp-run'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-shaker-run'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-ovn-jobs
       - multijob:
-          name: opnfv/functest-ovn-vnf:{tag}
+          name: opnfv/functest-vnf:{tag}
           execution-type: SEQUENTIALLY
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-cloudify-run'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-cloudify_ims-run'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify_ims-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-heat_ims-run'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-heat_ims-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-vyos_vrouter-run'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-vyos_vrouter-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-juju_epc-run'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-ovn-jobs
 
 - trigger:
@@ -928,15 +928,15 @@
       - multijob:
           name: remove former images
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-rmi'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-rmi'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-rmi'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rmi'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-rmi'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-rmi'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-rmi'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-rmi'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-ovn-jobs
       - multijob:
           name: remove dependencies
@@ -961,126 +961,126 @@
       - multijob:
           name: build containers
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-gate'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-gate'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-gate'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-gate'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-gate'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-gate'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-gate'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-gate'
               <<: *functest-ovn-jobs
       - multijob:
-          name: build opnfv/functest-ovn-smoke-cntt
+          name: build opnfv/functest-smoke-cntt
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-gate'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-gate'
               <<: *functest-ovn-jobs
       - multijob:
-          name: opnfv/functest-ovn-healthcheck:{tag}
+          name: opnfv/functest-healthcheck:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-connection_check-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-connection_check-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-tenantnetwork1-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tenantnetwork1-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-tenantnetwork2-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tenantnetwork2-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-vmready1-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vmready1-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-vmready2-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vmready2-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-singlevm1-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-singlevm1-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-singlevm2-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-singlevm2-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-vping_ssh-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vping_ssh-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-vping_userdata-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vping_userdata-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-cinder_test-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-cinder_test-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-odl-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-tempest_smoke-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-healthcheck-{tag}-tempest_horizon-run'
+            - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
               <<: *functest-ovn-jobs
       - multijob:
-          name: opnfv/functest-ovn-smoke:{tag}
+          name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-tempest_cinder-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-tempest_keystone-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_keystone-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-rally_sanity-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-refstack_defcore-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-refstack_compute-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_compute-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-refstack_object-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_object-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-refstack_platform-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_platform-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-tempest_full-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-tempest_scenario-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-tempest_slow-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_slow-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-patrole-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-neutron_trunk-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-networking-bgpvpn-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-networking-sfc-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-sfc-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-barbican-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-{tag}-octavia-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-octavia-run'
               <<: *functest-ovn-jobs
       - multijob:
-          name: opnfv/functest-ovn-smoke-cntt:{tag}
+          name: opnfv/functest-smoke-cntt:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-tempest_cinder-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-tempest_keystone-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-rally_sanity-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-tempest_full-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-tempest_scenario-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-smoke-cntt-{tag}-tempest_slow-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
               <<: *functest-ovn-jobs
       - multijob:
-          name: opnfv/functest-ovn-benchmarking:{tag}
+          name: opnfv/functest-benchmarking:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-rally_full-run'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-rally_jobs-run'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-vmtp-run'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-benchmarking-{tag}-shaker-run'
+            - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-ovn-jobs
       - multijob:
-          name: opnfv/functest-ovn-vnf:{tag}
+          name: opnfv/functest-vnf:{tag}
           execution-type: SEQUENTIALLY
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-cloudify-run'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-cloudify_ims-run'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify_ims-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-heat_ims-run'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-heat_ims-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-vyos_vrouter-run'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-vyos_vrouter-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-ovn-opnfv-functest-ovn-vnf-{tag}-juju_epc-run'
+            - name: 'functest-ovn-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-ovn-jobs
 
 - project: