summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorwutianwei <wutianwei1@huawei.com>2017-12-21 11:29:39 +0800
committerwutianwei <wutianwei1@huawei.com>2017-12-21 11:33:07 +0800
commit0af6c3870462760b6fd7ddc4b11df87727be5876 (patch)
treefcbcc8e67b4c0450c34925ad652e2807f6c0639a /jjb
parent8a8a2ccc371f803be2fc40d1c6d6627b42b90b55 (diff)
[compass4nfv] merge the docker image compass-tasks-k8s and compass-tasks-osa
to compass-tasks. And create a new docker image compass-tasks-base Change-Id: I3a6f38ce28fe465cf1c2c1723a41728a7cbcc60d Signed-off-by: wutianwei <wutianwei1@huawei.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/releng/compass4nfv-docker.yml11
1 files changed, 4 insertions, 7 deletions
diff --git a/jjb/releng/compass4nfv-docker.yml b/jjb/releng/compass4nfv-docker.yml
index 299908d66..db2e4273b 100644
--- a/jjb/releng/compass4nfv-docker.yml
+++ b/jjb/releng/compass4nfv-docker.yml
@@ -26,8 +26,7 @@
- 'cobbler'
- 'db'
- 'deck'
- - 'tasks-k8s'
- - 'tasks-osa'
+ - 'tasks-base'
# settings for jobs run in multijob phases
build-job-settings: &build-job-settings
@@ -78,10 +77,10 @@
builders:
- multijob:
- name: 'build compass-tasks images'
+ name: 'build compass-tasks-base images'
execution-type: PARALLEL
projects:
- - name: 'compass-tasks-build-amd64-{stream}'
+ - name: 'compass-tasks-base-build-amd64-{stream}'
<<: *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
- - 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: