X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-docker.yaml;h=561296000ed35a920528d3f9cccbc692762e4e1c;hp=fc2fd3cae11112d73ccd9a51ffc81c8f7231eec3;hb=7d251e861b54f1a9d9ab192c7c65e5a810541e43;hpb=190c6b1994e9b9504330455b8b791d0994ed50e6 diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index fc2fd3cae..561296000 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 @@ -29,18 +32,17 @@ - 'healthcheck' - 'features' - 'components' - - 'parser' - 'smoke' - 'benchmarking' - 'vnf' exclude: - stream: 'master' - image: 'parser' - - stream: 'fraser' - image: 'tempest' - - stream: 'fraser' - image: 'benchmarking' + image: 'components' + - stream: 'iruya' + image: 'components' + - stream: 'hunter' + image: 'components' # settings for jobs run in multijob phases build-job-settings: &build-job-settings @@ -147,10 +149,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}' @@ -174,8 +172,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}' @@ -203,9 +199,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 +216,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 +260,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