tempest_neutron-cntt -> tempest_neutron_cntt

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

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 8d75e03..aebafaf 100644 (file)
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -453,11 +453,11 @@
           projects:
             - name: 'airship-opnfv-functest-smoke-{tag}-tempest_neutron-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_cinder-run'
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_keystone-run'
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_keystone-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_heat-run'
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_heat-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *airship-jobs

diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index c47f2a1..1a65855 100644 (file)
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -311,7 +311,7 @@
     <<: *cntt-params
     container: 'functest-smoke'
     test:
-      - neutron-tempest-plugin-api
+      - tempest_neutron
       - tempest_cinder
       - tempest_keystone
       - tempest_heat
@@ -333,7 +333,7 @@
     <<: *cntt-params
     container: 'functest-smoke-cntt'
     test:
-      - neutron-tempest-plugin-api-cntt
+      - tempest_neutron_cntt
       - tempest_cinder_cntt
       - tempest_keystone_cntt
       - tempest_heat_cntt
@@ -511,7 +511,7 @@
           name: opnfv/functest-smoke:{functest_tag}
           condition: ALWAYS
           projects:
-            - name: 'cntt-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_neutron-run'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *cntt-jobs
@@ -543,7 +543,7 @@
           name: opnfv/functest-smoke-cntt:{tag}
           condition: ALWAYS
           projects:
-            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-cntt-run'
+            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *cntt-jobs

diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml
index 4f423e2..0b94257 100644 (file)
--- a/jjb/functest/functest.ovn.yaml
+++ b/jjb/functest/functest.ovn.yaml
@@ -359,7 +359,7 @@
     <<: *functest-ovn-params
     container: 'functest-smoke-cntt'
     test:
-      - tempest_neutron-cntt
+      - tempest_neutron_cntt
       - tempest_cinder_cntt
       - tempest_keystone_cntt
       - tempest_heat_cntt
@@ -569,7 +569,7 @@
           name: opnfv/functest-smoke-cntt:{tag}
           condition: ALWAYS
           projects:
-            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_neutron-cntt-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-ovn-jobs
@@ -903,7 +903,7 @@
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
           projects:
-            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_neutron-cntt-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-ovn-jobs

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index b883038..10bfb5e 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -367,7 +367,7 @@
     <<: *functest-params
     container: 'functest-smoke-cntt'
     test:
-      - tempest_neutron-cntt
+      - tempest_neutron_cntt
       - tempest_cinder_cntt
       - tempest_keystone_cntt
       - tempest_heat_cntt
@@ -574,7 +574,7 @@
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_neutron-cntt-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-jobs
@@ -904,7 +904,7 @@
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_neutron-cntt-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-jobs
@@ -1122,7 +1122,7 @@
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_neutron-cntt-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-jobs