Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update Functest slaves"
[releng.git]
/
jjb
/
functest
/
functest-docker.yaml
diff --git
a/jjb/functest/functest-docker.yaml
b/jjb/functest/functest-docker.yaml
index
19967e9
..
328ef7c
100644
(file)
--- a/
jjb/functest/functest-docker.yaml
+++ b/
jjb/functest/functest-docker.yaml
@@
-12,13
+12,13
@@
- master:
branch: '{stream}'
disabled: false
- master:
branch: '{stream}'
disabled: false
- -
hunter
:
+ -
iruya
:
branch: 'stable/{stream}'
disabled: false
branch: 'stable/{stream}'
disabled: false
- -
gambia
:
+ -
hunter
:
branch: 'stable/{stream}'
disabled: false
branch: 'stable/{stream}'
disabled: false
- -
fraser
:
+ -
gambia
:
branch: 'stable/{stream}'
disabled: false
branch: 'stable/{stream}'
disabled: false
@@
-35,22
+35,17
@@
- 'healthcheck'
- 'features'
- 'components'
- 'healthcheck'
- 'features'
- 'components'
- - 'parser'
- 'smoke'
- 'benchmarking'
- 'vnf'
exclude:
- stream: 'master'
- 'smoke'
- 'benchmarking'
- 'vnf'
exclude:
- stream: 'master'
- image: 'parser'
+ image: 'components'
+ - stream: 'iruya'
+ image: 'components'
- stream: 'hunter'
- 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
# 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
<<: *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}'
- 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
<<: *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}'
- 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")
#!/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 $?
esac
exit $?