X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-docker.yaml;h=d2549effffb405d840bac9dba81bb7c5f488b9d5;hb=0c37a675a3df3dc3091c7bd27a270b3bfc403f71;hp=74738f280f08d71e01914c1e16ea232c5dd35590;hpb=d2755cb7237222d0e6a0ebf88fcf2464c2708f86;p=releng.git

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 74738f280..d2549efff 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -12,13 +12,22 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - fraser:
+      - kali:
+          branch: 'stable/{stream}'
+          disabled: false
+      - jerma:
+          branch: 'stable/{stream}'
+          disabled: false
+      - iruya:
+          branch: 'stable/{stream}'
+          disabled: false
+      - 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'
 
@@ -27,17 +36,28 @@
       - 'core'
       - 'tempest'
       - 'healthcheck'
-      - 'features'
-      - 'components'
-      - 'parser'
       - 'smoke'
+      - 'benchmarking'
       - 'vnf'
+      - 'smoke-cntt'
+      - 'benchmarking-cntt'
+      - 'features'
 
     exclude:
       - stream: 'master'
-        image: 'parser'
-      - stream: 'fraser'
         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
@@ -81,7 +101,7 @@
       - functest-job-parameters:
           project: '{project}'
           branch: '{branch}'
-          slave_label: 'opnfv-build-ubuntu'
+          slave_label: 'lf-build2'
           arch_tag: 'amd64'
 
     properties:
@@ -136,26 +156,22 @@
               <<: *build-job-settings
             - name: 'functest-healthcheck-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
-            - name: 'functest-components-docker-build-amd64-{stream}'
-              <<: *build-job-settings
-            - name: 'functest-components-docker-build-arm64-{stream}'
-              <<: *build-job-settings
-            - name: 'functest-parser-docker-build-amd64-{stream}'
-              <<: *build-job-settings
-            - name: 'functest-parser-docker-build-arm64-{stream}'
-              <<: *build-job-settings
             - name: 'functest-smoke-docker-build-amd64-{stream}'
               <<: *build-job-settings
             - name: 'functest-smoke-docker-build-arm64-{stream}'
               <<: *build-job-settings
+            - name: 'functest-benchmarking-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-benchmarking-docker-build-arm64-{stream}'
+              <<: *build-job-settings
             - name: 'functest-vnf-docker-build-amd64-{stream}'
               <<: *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
@@ -163,15 +179,35 @@
           projects:
             - name: 'functest-healthcheck-docker-manifest-{stream}'
               <<: *manifest-job-settings
-            - name: 'functest-features-docker-manifest-{stream}'
+            - name: 'functest-smoke-docker-manifest-{stream}'
               <<: *manifest-job-settings
-            - name: 'functest-components-docker-manifest-{stream}'
+            - name: 'functest-benchmarking-docker-manifest-{stream}'
               <<: *manifest-job-settings
-            - name: 'functest-parser-docker-manifest-{stream}'
+            - name: 'functest-vnf-docker-manifest-{stream}'
               <<: *manifest-job-settings
-            - name: 'functest-smoke-docker-manifest-{stream}'
+            - name: 'functest-features-docker-manifest-{stream}'
               <<: *manifest-job-settings
-            - name: 'functest-vnf-docker-manifest-{stream}'
+      - multijob:
+          name: 'build all functest cntt images'
+          condition: SUCCESSFUL
+          execution-type: PARALLEL
+          projects:
+            - name: 'functest-smoke-cntt-docker-build-amd64-{stream}'
+              <<: *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
+          execution-type: PARALLEL
+          projects:
+            - name: 'functest-smoke-cntt-docker-manifest-{stream}'
+              <<: *manifest-job-settings
+            - name: 'functest-benchmarking-cntt-docker-manifest-{stream}'
               <<: *manifest-job-settings
 
     publishers:
@@ -194,9 +230,9 @@
           #!/bin/bash -ex
           case "{arch_tag}" in
           "arm64")
-              sudo amd64_dirs= arm64_dirs=docker/{image} bash ./build.sh ;;
+              sudo amd64_dirs= arm64_dirs=docker/{image} arm_dirs= bash ./build.sh ;;
           *)
-              sudo amd64_dirs=docker/{image} arm64_dirs= bash ./build.sh ;;
+              sudo amd64_dirs=docker/{image} arm64_dirs= arm_dirs= bash ./build.sh ;;
           esac
           exit $?
 
@@ -209,8 +245,10 @@
           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'
       - string:
           name: PROJECT
           default: "{project}"
@@ -253,6 +291,8 @@
           name: SLAVE_LABEL
           default: '{slave_label}'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT