X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-docker.yaml;h=6915ab4fdddc59cdf3c7d2f3adede1925b49e0f0;hb=0ca2124cb7da285607f58e2926923d27c82491e5;hp=19967e9fd450dff6d8a2b03fbb1b392bcce8609f;hpb=bede394dae3cc0f577a35a10880ea1f9fceeebbc;p=releng.git

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 19967e9fd..6915ab4fd 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -12,45 +12,57 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - hunter:
+      - leguer:
+          branch: 'stable/{stream}'
+          disabled: false
+      - kali:
           branch: 'stable/{stream}'
           disabled: false
-      - gambia:
+      - jerma:
           branch: 'stable/{stream}'
           disabled: false
-      - fraser:
+      - iruya:
+          branch: 'stable/{stream}'
+          disabled: false
+      - hunter:
           branch: 'stable/{stream}'
           disabled: false
 
     arch_tag:
       - 'amd64':
-          slave_label: 'opnfv-build-ubuntu'
-      - 'arm64':
-          slave_label: 'opnfv-build-ubuntu-arm'
+          slave_label: 'lf-build2'
 
     # yamllint disable rule:key-duplicates
     image:
       - 'core'
       - 'tempest'
       - 'healthcheck'
-      - 'features'
-      - 'components'
-      - 'parser'
       - 'smoke'
       - 'benchmarking'
       - 'vnf'
+      - 'smoke-cntt'
+      - 'benchmarking-cntt'
+      - 'features'
 
     exclude:
       - stream: 'master'
-        image: 'parser'
-      - stream: 'hunter'
-        image: 'parser'
-      - stream: 'gambia'
-        image: 'parser'
-      - stream: 'fraser'
         image: 'tempest'
-      - stream: 'fraser'
-        image: 'benchmarking'
+      - stream: 'leguer'
+        image: 'tempest'
+      - stream: 'kali'
+        image: 'tempest'
+      - stream: 'jerma'
+        image: 'tempest'
+      - stream: 'master'
+        image: 'features'
+      - stream: 'leguer'
+        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
@@ -94,7 +106,7 @@
       - functest-job-parameters:
           project: '{project}'
           branch: '{branch}'
-          slave_label: 'opnfv-build-ubuntu'
+          slave_label: 'lf-build2'
           arch_tag: 'amd64'
 
     properties:
@@ -118,8 +130,6 @@
           projects:
             - name: 'functest-core-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-core-docker-build-arm64-{stream}'
-              <<: *build-job-settings
       - multijob:
           name: 'publish functest-core manifests'
           execution-type: PARALLEL
@@ -132,8 +142,6 @@
           projects:
             - name: 'functest-tempest-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-tempest-docker-build-arm64-{stream}'
-              <<: *build-job-settings
       - multijob:
           name: 'publish functest-tempest manifests'
           execution-type: PARALLEL
@@ -147,31 +155,13 @@
           projects:
             - name: 'functest-healthcheck-docker-build-amd64-{stream}'
               <<: *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}'
+            - name: 'functest-features-docker-build-amd64-{stream}'
               <<: *build-job-settings
       - multijob:
           name: 'publish all manifests'
@@ -180,22 +170,35 @@
           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-parser-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-benchmarking-cntt-docker-build-amd64-{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'
-      - 'functest-arm64-recipients'
 
 - job-template:
     name: 'functest-{image}-docker-build-{arch_tag}-{stream}'
@@ -211,12 +214,7 @@
     builders:
       - shell: |
           #!/bin/bash -ex
-          case "{arch_tag}" in
-          "arm64")
-              sudo amd64_dirs= arm64_dirs=docker/{image} bash ./build.sh ;;
-          *)
-              sudo amd64_dirs=docker/{image} arm64_dirs= bash ./build.sh ;;
-          esac
+          sudo amd64_dirs=docker/{image} arm64_dirs= arm_dirs= bash ./build.sh
           exit $?
 
 - job-template:
@@ -228,7 +226,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'
@@ -258,7 +256,7 @@
               tag="{stream}" ;;
           esac
           sudo manifest-tool push from-args \
-              --platforms linux/amd64,linux/arm64 \
+              --platforms linux/amd64 \
               --template $REPO/functest-{image}:ARCH-$tag \
               --target $REPO/functest-{image}:$tag
           exit $?
@@ -310,15 +308,6 @@
           description: "Repository name for functest images"
 
 # publisher macros
-- publisher:
-    name: 'functest-arm64-recipients'
-    publishers:
-      - email:
-          recipients: >
-            cristina.pauna@enea.com
-            alexandru.avadanii@enea.com
-            delia.popescu@enea.com
-
 - publisher:
     name: 'functest-amd64-recipients'
     publishers: