X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-docker.yaml;h=d2549effffb405d840bac9dba81bb7c5f488b9d5;hb=c56a3429e0c2a5cad3246fccb61c6a448331a71d;hp=8685ea4b37fd397e49cd899d3874b2b678a6ae8d;hpb=368adda8beebcf81166a1a51d9190f837c6ee554;p=releng.git

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 8685ea4b3..d2549efff 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -12,6 +12,9 @@
       - master:
           branch: '{stream}'
           disabled: false
+      - kali:
+          branch: 'stable/{stream}'
+          disabled: false
       - jerma:
           branch: 'stable/{stream}'
           disabled: false
@@ -24,7 +27,7 @@
 
     arch_tag:
       - 'amd64':
-          slave_label: 'opnfv-build-ubuntu'
+          slave_label: 'lf-build2'
       - 'arm64':
           slave_label: 'opnfv-build-ubuntu-arm'
 
@@ -37,12 +40,24 @@
       - 'benchmarking'
       - 'vnf'
       - 'smoke-cntt'
+      - 'benchmarking-cntt'
+      - 'features'
 
     exclude:
       - stream: 'master'
         image: 'tempest'
+      - stream: 'kali'
+        image: 'tempest'
       - stream: 'jerma'
         image: 'tempest'
+      - stream: 'master'
+        image: 'features'
+      - stream: 'kali'
+        image: 'features'
+      - stream: 'jerma'
+        image: 'features'
+      - stream: 'iruya'
+        image: 'features'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
@@ -86,7 +101,7 @@
       - functest-job-parameters:
           project: '{project}'
           branch: '{branch}'
-          slave_label: 'opnfv-build-ubuntu'
+          slave_label: 'lf-build2'
           arch_tag: 'amd64'
 
     properties:
@@ -153,6 +168,10 @@
               <<: *build-job-settings
             - name: 'functest-vnf-docker-build-arm64-{stream}'
               <<: *build-job-settings
+            - name: 'functest-features-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-features-docker-build-arm64-{stream}'
+              <<: *build-job-settings
       - multijob:
           name: 'publish all manifests'
           condition: SUCCESSFUL
@@ -166,6 +185,8 @@
               <<: *manifest-job-settings
             - name: 'functest-vnf-docker-manifest-{stream}'
               <<: *manifest-job-settings
+            - name: 'functest-features-docker-manifest-{stream}'
+              <<: *manifest-job-settings
       - multijob:
           name: 'build all functest cntt images'
           condition: SUCCESSFUL
@@ -175,6 +196,10 @@
               <<: *build-job-settings
             - name: 'functest-smoke-cntt-docker-build-arm64-{stream}'
               <<: *build-job-settings
+            - name: 'functest-benchmarking-cntt-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-benchmarking-cntt-docker-build-arm64-{stream}'
+              <<: *build-job-settings
       - multijob:
           name: 'publish all cntt manifests'
           condition: SUCCESSFUL
@@ -182,6 +207,8 @@
           projects:
             - name: 'functest-smoke-cntt-docker-manifest-{stream}'
               <<: *manifest-job-settings
+            - name: 'functest-benchmarking-cntt-docker-manifest-{stream}'
+              <<: *manifest-job-settings
 
     publishers:
       - 'functest-amd64-recipients'
@@ -218,7 +245,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'