Add cnf_conformance in all master jobs

Change-Id: I3a91a6731889fba06a255b86564de04ceb6efcd1
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 f33d028..bfc6824 100644 (file)
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -342,6 +342,37 @@
     container: 'functest-kubernetes-cnf'
     test:
       - k8s_vims
+    exclude:
+      - tag: kali
+        test: cnf_conformance
+      - tag: jerma
+        test: cnf_conformance
+      - tag: iruya
+        test: cnf_conformance
+      - tag: hunter
+        test: cnf_conformance
+      - tag: arm-latest
+        test: cnf_conformance
+      - tag: arm-kali
+        test: cnf_conformance
+      - tag: arm-jerma
+        test: cnf_conformance
+      - tag: arm-iruya
+        test: cnf_conformance
+      - tag: arm-hunter
+        test: cnf_conformance
+      - tag: arm64-latest
+        test: cnf_conformance
+      - tag: arm64-kali
+        test: cnf_conformance
+      - tag: arm64-kali
+        test: cnf_conformance
+      - tag: arm64-jerma
+        test: cnf_conformance
+      - tag: arm64-iruya
+        test: cnf_conformance
+      - tag: arm64-hunter
+        test: cnf_conformance
     privileged: 'false'
     network: bridge
     jobs:
@@ -471,6 +502,8 @@
       - multijob:
           name: ollivier/functest-kubernetes-cnf:{tag}
           projects:
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+              <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *functest-kubernetes-pi-jobs
       - multijob:

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index a96ba32..be4dc8b 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -335,7 +335,27 @@
     <<: *functest-kubernetes-params
     container: 'functest-kubernetes-cnf'
     test:
+      - cnf_conformance
       - k8s_vims
+    exclude:
+      - tag: kali
+        test: cnf_conformance
+      - tag: jerma
+        test: cnf_conformance
+      - tag: iruya
+        test: cnf_conformance
+      - tag: hunter
+        test: cnf_conformance
+      - tag: arm64-latest
+        test: cnf_conformance
+      - tag: arm64-kali
+        test: cnf_conformance
+      - tag: arm64-jerma
+        test: cnf_conformance
+      - tag: arm64-iruya
+        test: cnf_conformance
+      - tag: arm64-hunter
+        test: cnf_conformance
     privileged: 'false'
     network: bridge
     jobs:
@@ -465,6 +485,8 @@
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *functest-kubernetes-jobs
       - multijob:
@@ -724,6 +746,8 @@
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *functest-kubernetes-jobs
 
@@ -846,6 +870,8 @@
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *functest-kubernetes-jobs