X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-docker.yaml;h=328ef7c6c4c8f409f9ba42a9f2761cfc1b8477b2;hb=702035c04ad807206a1649edfb24b5cc9caac15d;hp=19967e9fd450dff6d8a2b03fbb1b392bcce8609f;hpb=726b96c6746aba86c253a5505561a4d96426115f;p=releng.git diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index 19967e9fd..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,22 +35,17 @@ - 'healthcheck' - 'features' - 'components' - - 'parser' - 'smoke' - 'benchmarking' - 'vnf' exclude: - stream: 'master' - image: 'parser' + image: 'components' + - stream: 'iruya' + image: 'components' - 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 @@ -157,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}' @@ -184,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}' @@ -213,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 $?