X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes-docker.yaml;h=00159ec630aee0902f22d93bfbc8a430e4a2d1e4;hb=39ebf17bec845d67d36e421247ab3b82bea78301;hp=c328f5d86b2d900c250146a3d83d82b6dd5ce453;hpb=726b96c6746aba86c253a5505561a4d96426115f;p=releng.git

diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml
index c328f5d86..00159ec63 100644
--- a/jjb/functest/functest-kubernetes-docker.yaml
+++ b/jjb/functest/functest-kubernetes-docker.yaml
@@ -12,19 +12,22 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - hunter:
+      - kali:
+          branch: 'stable/{stream}'
+          disabled: false
+      - jerma:
           branch: 'stable/{stream}'
           disabled: false
-      - gambia:
+      - iruya:
           branch: 'stable/{stream}'
           disabled: false
-      - fraser:
+      - hunter:
           branch: 'stable/{stream}'
           disabled: false
 
     arch_tag:
       - 'amd64':
-          slave_label: 'opnfv-build-ubuntu'
+          slave_label: 'lf-build2'
       - 'arm64':
           slave_label: 'opnfv-build-ubuntu-arm'
 
@@ -32,8 +35,9 @@
     image:
       - 'core'
       - 'healthcheck'
-      - 'features'
       - 'smoke'
+      - 'cnf'
+      - 'security'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
@@ -77,7 +81,7 @@
       - functest-kubernetes-job-parameters:
           project: '{project}'
           branch: '{branch}'
-          slave_label: 'opnfv-build-ubuntu'
+          slave_label: 'lf-build2'
           arch_tag: 'amd64'
 
     properties:
@@ -110,39 +114,45 @@
             - 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:
-            - name: 'functest-kubernetes-features-docker-build-amd64-{stream}'
-              <<: *build-job-settings
-            - name: 'functest-kubernetes-features-docker-build-arm64-{stream}'
-              <<: *build-job-settings
             - name: 'functest-kubernetes-smoke-docker-build-amd64-{stream}'
               <<: *build-job-settings
             - 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:
-            - name: 'functest-kubernetes-features-docker-manifest-{stream}'
-              <<: *manifest-job-settings
             - name: 'functest-kubernetes-smoke-docker-manifest-{stream}'
               <<: *manifest-job-settings
 
@@ -181,7 +191,7 @@
           branch: '{branch}'
       - label:
           name: SLAVE_LABEL
-          default: 'opnfv-build-ubuntu'
+          default: 'lf-build2'
           description: 'Slave label on Jenkins'
           all-nodes: false
           node-eligibility: 'ignore-offline'