1 files changed, 7 insertions, 22 deletions

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 71215cae1..328ef7c6c 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -12,13 +12,13 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
           disabled: false
-      - gambia:
+      - hunter:
           branch: 'stable/{stream}'
           disabled: false
-      - fraser:
+      - gambia:
           branch: 'stable/{stream}'
           disabled: false
 
@@ -35,7 +35,6 @@
       - 'healthcheck'
       - 'features'
       - 'components'
-      - 'parser'
       - 'smoke'
       - 'benchmarking'
       - 'vnf'
@@ -43,18 +42,10 @@
     exclude:
       - stream: 'master'
         image: 'components'
-      - stream: 'hunter'
+      - stream: 'iruya'
         image: 'components'
-      - stream: 'master'
-        image: 'parser'
       - stream: 'hunter'
-        image: 'parser'
-      - stream: 'gambia'
-        image: 'parser'
-      - stream: 'fraser'
-        image: 'tempest'
-      - stream: 'fraser'
-        image: 'benchmarking'
+        image: 'components'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
@@ -161,10 +152,6 @@
               <<: *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}'
@@ -188,8 +175,6 @@
               <<: *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}'
@@ -217,9 +202,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 $?