From 43b2e376b51a36427ac005039d41502718a63264 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 13 Mar 2020 16:18:20 +0100
Subject: Build new Functest K8s containers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It adds security and cnf [1][2].

[1] https://gerrit.opnfv.org/gerrit/c/functest-kubernetes/+/69775
[2] https://gerrit.opnfv.org/gerrit/c/functest-kubernetes/+/69663

Change-Id: I870cf4913f60e2f0e3587459c3d343dbf96a9ae2
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/functest/functest-kubernetes-docker.yaml | 36 ++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml
index 21fbdb4ec..6d8846b5c 100644
--- a/jjb/functest/functest-kubernetes-docker.yaml
+++ b/jjb/functest/functest-kubernetes-docker.yaml
@@ -33,6 +33,22 @@
       - 'core'
       - 'healthcheck'
       - 'smoke'
+      - 'cnf'
+      - 'security'
+
+    exclude:
+      - stream: 'jerma'
+        image: 'cnf'
+      - stream: 'jerma'
+        image: 'security'
+      - stream: 'iruya'
+        image: 'cnf'
+      - stream: 'iruya'
+        image: 'security'
+      - stream: 'hunter'
+        image: 'cnf'
+      - stream: 'hunter'
+        image: 'security'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
@@ -109,21 +125,33 @@
             - name: 'functest-kubernetes-core-docker-manifest-{stream}'
               <<: *manifest-job-settings
       - multijob:
-          name: 'build functest-kubernetes-healthcheck images'
+          name: 'build functest-kubernetes-[healthcheck,cnf,security] images'
           execution-type: PARALLEL
           projects:
             - name: 'functest-kubernetes-healthcheck-docker-build-amd64-{stream}'
               <<: *build-job-settings
             - name: 'functest-kubernetes-healthcheck-docker-build-arm64-{stream}'
               <<: *build-job-settings
+            - name: 'functest-kubernetes-cnf-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-kubernetes-cnf-docker-build-arm64-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-kubernetes-security-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-kubernetes-security-docker-build-arm64-{stream}'
+              <<: *build-job-settings
       - multijob:
-          name: 'publish functest-kubernetes-healthcheck manifests'
+          name: 'publish functest-kubernetes-[healthcheck,cnf,security] manifests'
           execution-type: PARALLEL
           projects:
             - name: 'functest-kubernetes-healthcheck-docker-manifest-{stream}'
               <<: *manifest-job-settings
+            - name: 'functest-kubernetes-cnf-docker-manifest-{stream}'
+              <<: *manifest-job-settings
+            - name: 'functest-kubernetes-security-docker-manifest-{stream}'
+              <<: *manifest-job-settings
       - multijob:
-          name: 'build all functest-kubernetes images'
+          name: 'build functest-kubernetes-smoke image'
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
@@ -132,7 +160,7 @@
             - name: 'functest-kubernetes-smoke-docker-build-arm64-{stream}'
               <<: *build-job-settings
       - multijob:
-          name: 'publish all manifests'
+          name: 'publish functest-kubernetes-smoke manifests'
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-- 
cgit 1.2.3-korg