From 54071317aa8e70dcce7c74d7872817164c48762d Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Wed, 16 Sep 2020 13:23:52 +0200
Subject: [PATCH] Add helm_vims in all gate jobs
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: I8bcd2a8c5c2b6bccd9d8264bd9bcbeeb5075b0cc
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/functest/functest-kubernetes-pi.yaml | 15 ++++++++++++---
 jjb/functest/functest-kubernetes.yaml    | 25 ++++++++++++++++++-------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 864e3b0c6..b997e6651 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -343,15 +343,22 @@
     <<: *functest-kubernetes-pi-params
     container: 'functest-kubernetes-cnf'
     test:
-      - cnf_conformance
       - k8s_vims
+      - helm_vims
+      - cnf_conformance
     exclude:
       - tag: iruya
         test: k8s_vims
+      - tag: iruya
+        test: helm_vims
       - tag: arm-iruya
         test: k8s_vims
+      - tag: arm-iruya
+        test: helm_vims
       - tag: arm64-iruya
         test: k8s_vims
+      - tag: arm64-iruya
+        test: helm_vims
     privileged: 'false'
     network: bridge
     jobs:
@@ -485,10 +492,12 @@
       - 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
+            - 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'
+              <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: dump all campaign data
           projects:
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index e3b8d0cb3..6912cd68b 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -337,13 +337,18 @@
     <<: *functest-kubernetes-params
     container: 'functest-kubernetes-cnf'
     test:
-      - cnf_conformance
       - k8s_vims
+      - helm_vims
+      - cnf_conformance
     exclude:
       - tag: iruya
         test: k8s_vims
+      - tag: iruya
+        test: helm_vims
       - tag: arm64-iruya
         test: k8s_vims
+      - tag: arm64-iruya
+        test: helm_vims
     privileged: 'false'
     network: bridge
     jobs:
@@ -477,10 +482,12 @@
       - 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
+            - 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'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: dump all campaign data
           projects:
@@ -742,10 +749,12 @@
       - 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
+            - 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'
+              <<: *functest-kubernetes-jobs
 
 - trigger:
     name: functest-kubernetes-patchset-created
@@ -870,10 +879,12 @@
       - 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
+            - 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'
+              <<: *functest-kubernetes-jobs
 
 - project:
     name: 'functest-kubernetes'
-- 
2.16.6