X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-docker.yaml;h=bb25c0f3c3f1aa7c5237c1d0325645ff788b5a54;hb=3ecb0c33570d1b37a2034db84c499fcc3a95012b;hp=19967e9fd450dff6d8a2b03fbb1b392bcce8609f;hpb=3f9fb3f3ad1bb8b56eaec535f11a523d3bfac4a2;p=releng.git

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 19967e9fd..bb25c0f3c 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -12,13 +12,10 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - hunter:
-          branch: 'stable/{stream}'
-          disabled: false
-      - gambia:
+      - iruya:
           branch: 'stable/{stream}'
           disabled: false
-      - fraser:
+      - hunter:
           branch: 'stable/{stream}'
           disabled: false
 
@@ -33,24 +30,13 @@
       - 'core'
       - 'tempest'
       - 'healthcheck'
-      - 'features'
-      - 'components'
-      - 'parser'
       - 'smoke'
       - 'benchmarking'
       - 'vnf'
 
     exclude:
       - stream: 'master'
-        image: 'parser'
-      - stream: 'hunter'
-        image: 'parser'
-      - stream: 'gambia'
-        image: 'parser'
-      - stream: 'fraser'
         image: 'tempest'
-      - stream: 'fraser'
-        image: 'benchmarking'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
@@ -149,18 +135,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-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}'
@@ -180,12 +154,6 @@
           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}'
@@ -213,9 +181,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 $?