Rename Functest CNTT testcases

Test DB and API don't support suites which raise side effects in Cachet
if both IaaS verification and CNTT conformance are executed.

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

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 663db8c..1262004 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -354,13 +354,13 @@
     <<: *functest-params
     container: 'functest-smoke-cntt'
     test:
-      - neutron-tempest-plugin-api
-      - tempest_cinder
-      - tempest_keystone
-      - rally_sanity
-      - tempest_full
-      - tempest_scenario
-      - tempest_slow
+      - neutron-tempest-plugin-api-cntt
+      - tempest_cinder_cntt
+      - tempest_keystone_cntt
+      - rally_sanity_cntt
+      - tempest_full_cntt
+      - tempest_scenario_cntt
+      - tempest_slow_cntt
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -544,19 +544,19 @@
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow_cntt-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
@@ -849,19 +849,19 @@
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow_cntt-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
@@ -1052,19 +1052,19 @@
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario_cntt-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow_cntt-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}