diff options
| author |   mei mei <meimei@huawei.com> | 2017-12-28 01:18:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-28 01:18:49 +0000 |
| commit | b289ef90894a8c2255f199c567bd030389755621 (patch) | |
| tree | fdbe519fc9d5c561238f64ac3b4c577e53212644 | |
| parent | c019ec5a0f10b81673e0cf29da3df4e8404bf21e (diff) | |
| parent | 0af6c3870462760b6fd7ddc4b11df87727be5876 (diff) | |
Merge "[compass4nfv] merge the docker image compass-tasks-k8s and compass-tasks-osa to compass-tasks. And create a new docker image compass-tasks-base"
| -rw-r--r-- | jjb/releng/compass4nfv-docker.yml | 11 |
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: |