X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-docker.yaml;h=c11b4e13dbbdeb5cdd7a5fb29ded41cbb06320be;hb=030ba95349f352bf491dcbb9e713d7b307519ae1;hp=dc833f5cd92d850192ef584b523b7210db097339;hpb=3a0f403c1fb0401fea2ad56d55d294b40c8cf215;p=releng.git

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index dc833f5cd..c11b4e13d 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -12,13 +12,13 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - iruya:
+      - jerma:
           branch: 'stable/{stream}'
           disabled: false
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
           disabled: false
-      - gambia:
+      - hunter:
           branch: 'stable/{stream}'
           disabled: false
 
@@ -33,19 +33,24 @@
       - 'core'
       - 'tempest'
       - 'healthcheck'
-      - 'features'
-      - 'components'
       - 'smoke'
       - 'benchmarking'
       - 'vnf'
+      - 'smoke-cntt'
+      - 'benchmarking-cntt'
+      - 'features'
 
     exclude:
       - stream: 'master'
-        image: 'components'
+        image: 'tempest'
+      - stream: 'jerma'
+        image: 'tempest'
+      - stream: 'master'
+        image: 'features'
+      - stream: 'jerma'
+        image: 'features'
       - stream: 'iruya'
-        image: 'components'
-      - stream: 'hunter'
-        image: 'components'
+        image: 'features'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
@@ -144,14 +149,6 @@
               <<: *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-smoke-docker-build-amd64-{stream}'
               <<: *build-job-settings
             - name: 'functest-smoke-docker-build-arm64-{stream}'
@@ -164,6 +161,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
@@ -171,16 +172,36 @@
           projects:
             - name: 'functest-healthcheck-docker-manifest-{stream}'
               <<: *manifest-job-settings
-            - name: 'functest-features-docker-manifest-{stream}'
-              <<: *manifest-job-settings
-            - name: 'functest-components-docker-manifest-{stream}'
-              <<: *manifest-job-settings
             - name: 'functest-smoke-docker-manifest-{stream}'
               <<: *manifest-job-settings
             - name: 'functest-benchmarking-docker-manifest-{stream}'
               <<: *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
+          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:
       - 'functest-amd64-recipients'
@@ -202,9 +223,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 $?