X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-docker.yaml;h=25ca03ab31802a5d072feb81922375a96b63e6ef;hb=5141565bb09aedf33878648af08863b86e8dba27;hp=fc2fd3cae11112d73ccd9a51ffc81c8f7231eec3;hpb=183e34c6790183dcae39fb1be7064eef74c3d03e;p=releng.git

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index fc2fd3cae..25ca03ab3 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -12,7 +12,10 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - fraser:
+      - iruya:
+          branch: 'stable/{stream}'
+          disabled: false
+      - hunter:
           branch: 'stable/{stream}'
           disabled: false
 
@@ -28,19 +31,13 @@
       - 'tempest'
       - 'healthcheck'
       - 'features'
-      - 'components'
-      - 'parser'
       - 'smoke'
       - 'benchmarking'
       - 'vnf'
 
     exclude:
       - stream: 'master'
-        image: 'parser'
-      - stream: 'fraser'
         image: 'tempest'
-      - stream: 'fraser'
-        image: 'benchmarking'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
@@ -143,14 +140,6 @@
               <<: *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}'
@@ -172,10 +161,6 @@
               <<: *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}'
@@ -203,9 +188,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 $?
 
@@ -220,6 +205,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build-ubuntu'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: PROJECT
           default: "{project}"
@@ -262,6 +249,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