X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-docker.yaml;h=fb3093d23087d0e47d507a3138d936bd86bc80a7;hb=93928495947d2463bc0bc19ca85592513271f011;hp=74738f280f08d71e01914c1e16ea232c5dd35590;hpb=e6817b9d64bd972c791727e40687a313ce3321c9;p=releng.git

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 74738f280..fb3093d23 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -12,7 +12,13 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - fraser:
+      - iruya:
+          branch: 'stable/{stream}'
+          disabled: false
+      - hunter:
+          branch: 'stable/{stream}'
+          disabled: false
+      - gambia:
           branch: 'stable/{stream}'
           disabled: false
 
@@ -29,15 +35,17 @@
       - 'healthcheck'
       - 'features'
       - 'components'
-      - 'parser'
       - 'smoke'
+      - 'benchmarking'
       - 'vnf'
 
     exclude:
       - stream: 'master'
-        image: 'parser'
-      - stream: 'fraser'
-        image: 'tempest'
+        image: 'components'
+      - stream: 'iruya'
+        image: 'components'
+      - stream: 'hunter'
+        image: 'components'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
@@ -105,8 +113,8 @@
           projects:
             - name: 'functest-core-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-core-docker-build-arm64-{stream}'
-              <<: *build-job-settings
+              # - name: 'functest-core-docker-build-arm64-{stream}'
+              #   <<: *build-job-settings
       - multijob:
           name: 'publish functest-core manifests'
           execution-type: PARALLEL
@@ -119,8 +127,8 @@
           projects:
             - name: 'functest-tempest-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-tempest-docker-build-arm64-{stream}'
-              <<: *build-job-settings
+              # - name: 'functest-tempest-docker-build-arm64-{stream}'
+              #   <<: *build-job-settings
       - multijob:
           name: 'publish functest-tempest manifests'
           execution-type: PARALLEL
@@ -134,28 +142,28 @@
           projects:
             - name: 'functest-healthcheck-docker-build-amd64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-healthcheck-docker-build-arm64-{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-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-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}'
+              # - 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}'
-              <<: *build-job-settings
+              # - name: 'functest-vnf-docker-build-arm64-{stream}'
+              #   <<: *build-job-settings
       - multijob:
           name: 'publish all manifests'
           condition: SUCCESSFUL
@@ -167,10 +175,10 @@
               <<: *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
 
@@ -194,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 $?
 
@@ -211,6 +219,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}"
@@ -253,6 +263,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