X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-docker.yaml;h=be0f6699cafacea34356b0f738dec85e8c9a750b;hb=14f49ba6eabde7e21ba383694283842c45aece66;hp=03ef43629d7fc95f1da4a1e4aa86ddb5f883e637;hpb=3f4e84a7401973f6449ff38f3ed4224a2572771a;p=releng.git diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index 03ef43629..be0f6699c 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -12,13 +12,10 @@ - master: branch: '{stream}' disabled: false - - hunter: - branch: 'stable/{stream}' - disabled: false - - gambia: + - iruya: branch: 'stable/{stream}' disabled: false - - fraser: + - hunter: branch: 'stable/{stream}' disabled: false @@ -35,24 +32,13 @@ - 'healthcheck' - 'features' - 'components' - - 'parser' - 'smoke' - 'benchmarking' - 'vnf' exclude: - stream: 'master' - image: 'components' - - stream: 'master' - image: 'parser' - - stream: 'hunter' - image: 'parser' - - stream: 'gambia' - image: 'parser' - - stream: 'fraser' image: 'tempest' - - stream: 'fraser' - image: 'benchmarking' # settings for jobs run in multijob phases build-job-settings: &build-job-settings @@ -159,10 +145,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}' @@ -186,8 +168,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}' @@ -215,9 +195,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 $?