From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 3 May 2021 10:16:30 +0000 (+0200)
Subject: Update cnf_conformance to cnf_testsuite
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8590449b1be7f9fbcbfdf08070832cdb86dc431c;p=releng.git

Update cnf_conformance to cnf_testsuite

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

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 9087d784c..81ab55946 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -305,7 +305,7 @@
     test:
       - k8s_vims
       - helm_vims
-      - cnf_conformance
+      - cnf_testsuite
     privileged: 'false'
     network: bridge
     jobs:
@@ -473,7 +473,7 @@
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-helm_vims-run'
               <<: *functest-kubernetes-pi-jobs
-            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-cnf_testsuite-run'
               <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: dump all campaign data
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 03920591f..f35ab8e36 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -300,7 +300,7 @@
     test:
       - k8s_vims
       - helm_vims
-      - cnf_conformance
+      - cnf_testsuite
     privileged: 'false'
     network: bridge
     jobs:
@@ -468,7 +468,7 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-helm_vims-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_testsuite-run'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: dump all campaign data
@@ -862,7 +862,7 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-helm_vims-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_testsuite-run'
               <<: *functest-kubernetes-jobs
 
 - project: