Merge "Prepare backporting CNF to Hunter and newer"

[releng.git] / jjb / functest / functest-kubernetes-docker.yaml

diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml
index c8c55e7..414e92f 100644 (file)
--- a/jjb/functest/functest-kubernetes-docker.yaml
+++ b/jjb/functest/functest-kubernetes-docker.yaml
@@ -12,6 +12,12 @@
       - master:
           branch: '{stream}'
           disabled: false
+      - kali:
+          branch: 'stable/{stream}'
+          disabled: false
+      - jerma:
+          branch: 'stable/{stream}'
+          disabled: false
       - iruya:
           branch: 'stable/{stream}'
           disabled: false
@@ -21,7 +27,7 @@
 
     arch_tag:
       - 'amd64':
-          slave_label: 'opnfv-build-ubuntu'
+          slave_label: 'lf-build2'
       - 'arm64':
           slave_label: 'opnfv-build-ubuntu-arm'
 
@@ -29,8 +35,17 @@
     image:
       - 'core'
       - 'healthcheck'
-      - 'features'
       - 'smoke'
+      - 'cnf'
+      - 'security'
+
+    exclude:
+      - stream: 'jerma'
+        image: 'cnf'
+      - stream: 'iruya'
+        image: 'cnf'
+      - stream: 'hunter'
+        image: 'cnf'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
@@ -74,7 +89,7 @@
       - functest-kubernetes-job-parameters:
           project: '{project}'
           branch: '{branch}'
-          slave_label: 'opnfv-build-ubuntu'
+          slave_label: 'lf-build2'
           arch_tag: 'amd64'
 
     properties:
@@ -107,39 +122,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
 
@@ -178,7 +199,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'