Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[compass4nfv] merge the docker image compass-tasks-k8s and compass-tasks-osa
[releng.git]
/
jjb
/
releng
/
compass4nfv-docker.yml
diff --git
a/jjb/releng/compass4nfv-docker.yml
b/jjb/releng/compass4nfv-docker.yml
index
299908d
..
db2e427
100644
(file)
--- a/
jjb/releng/compass4nfv-docker.yml
+++ b/
jjb/releng/compass4nfv-docker.yml
@@
-26,8
+26,7
@@
- 'cobbler'
- 'db'
- 'deck'
- 'cobbler'
- 'db'
- 'deck'
- - 'tasks-k8s'
- - 'tasks-osa'
+ - 'tasks-base'
# 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
@@
-78,10
+77,10
@@
builders:
- multijob:
builders:
- multijob:
- name: 'build compass-tasks images'
+ name: 'build compass-tasks
-base
images'
execution-type: PARALLEL
projects:
execution-type: PARALLEL
projects:
- - name: 'compass-tasks-build-amd64-{stream}'
+ - name: 'compass-tasks-b
ase-b
uild-amd64-{stream}'
<<: *build-job-settings
- multijob:
name: 'build all compass images'
<<: *build-job-settings
- multijob:
name: 'build all compass images'
@@
-94,9
+93,7
@@
<<: *build-job-settings
- name: 'compass-deck-build-amd64-{stream}'
<<: *build-job-settings
<<: *build-job-settings
- name: 'compass-deck-build-amd64-{stream}'
<<: *build-job-settings
- - name: 'compass-tasks-k8s-build-amd64-{stream}'
- <<: *build-job-settings
- - name: 'compass-tasks-osa-build-amd64-{stream}'
+ - name: 'compass-tasks-build-amd64-{stream}'
<<: *build-job-settings
publishers:
<<: *build-job-settings
publishers: