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 the CI pod info"
[releng.git]
/
jjb
/
functest
/
functest-docker.yaml
diff --git
a/jjb/functest/functest-docker.yaml
b/jjb/functest/functest-docker.yaml
index
74738f2
..
03ef436
100644
(file)
--- a/
jjb/functest/functest-docker.yaml
+++ b/
jjb/functest/functest-docker.yaml
@@
-12,6
+12,12
@@
- master:
branch: '{stream}'
disabled: false
- master:
branch: '{stream}'
disabled: false
+ - hunter:
+ branch: 'stable/{stream}'
+ disabled: false
+ - gambia:
+ branch: 'stable/{stream}'
+ disabled: false
- fraser:
branch: 'stable/{stream}'
disabled: false
- fraser:
branch: 'stable/{stream}'
disabled: false
@@
-31,13
+37,22
@@
- 'components'
- 'parser'
- 'smoke'
- 'components'
- 'parser'
- 'smoke'
+ - 'benchmarking'
- 'vnf'
exclude:
- stream: 'master'
- 'vnf'
exclude:
- stream: 'master'
+ image: 'components'
+ - stream: 'master'
+ image: 'parser'
+ - stream: 'hunter'
+ image: 'parser'
+ - stream: 'gambia'
image: 'parser'
- stream: 'fraser'
image: 'tempest'
image: 'parser'
- stream: 'fraser'
image: 'tempest'
+ - stream: 'fraser'
+ image: 'benchmarking'
# 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
@@
-152,6
+167,10
@@
<<: *build-job-settings
- name: 'functest-smoke-docker-build-arm64-{stream}'
<<: *build-job-settings
<<: *build-job-settings
- 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}'
- name: 'functest-vnf-docker-build-amd64-{stream}'
<<: *build-job-settings
- name: 'functest-vnf-docker-build-arm64-{stream}'
@@
-171,6
+190,8
@@
<<: *manifest-job-settings
- name: 'functest-smoke-docker-manifest-{stream}'
<<: *manifest-job-settings
<<: *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
- name: 'functest-vnf-docker-manifest-{stream}'
<<: *manifest-job-settings
@@
-211,6
+232,8
@@
name: SLAVE_LABEL
default: 'opnfv-build-ubuntu'
description: 'Slave label on Jenkins'
name: SLAVE_LABEL
default: 'opnfv-build-ubuntu'
description: 'Slave label on Jenkins'
+ all-nodes: false
+ node-eligibility: 'ignore-offline'
- string:
name: PROJECT
default: "{project}"
- string:
name: PROJECT
default: "{project}"
@@
-253,6
+276,8
@@
name: SLAVE_LABEL
default: '{slave_label}'
description: 'Slave label on Jenkins'
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
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT