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 "create Stable Branch Jobs for nfvbench"
[releng.git]
/
jjb
/
releng
/
compass4nfv-docker.yml
diff --git
a/jjb/releng/compass4nfv-docker.yml
b/jjb/releng/compass4nfv-docker.yml
index
299908d
..
5fbb37c
100644
(file)
--- a/
jjb/releng/compass4nfv-docker.yml
+++ b/
jjb/releng/compass4nfv-docker.yml
@@
-26,6
+26,7
@@
- 'cobbler'
- 'db'
- 'deck'
- 'cobbler'
- 'db'
- 'deck'
+ - 'tasks-base'
- 'tasks-k8s'
- 'tasks-osa'
- 'tasks-k8s'
- 'tasks-osa'
@@
-37,7
+38,7
@@
predefined-parameters: |
PUSH_IMAGE=$PUSH_IMAGE
COMMIT_ID=$COMMIT_ID
predefined-parameters: |
PUSH_IMAGE=$PUSH_IMAGE
COMMIT_ID=$COMMIT_ID
- RELEASE_VERSION=$RELEASE_VERSION
+ GERRIT_REFNAME=$GERRIT_REFNAME
DOCKERFILE=$DOCKERFILE
kill-phase-on: FAILURE
abort-all-jobs: false
DOCKERFILE=$DOCKERFILE
kill-phase-on: FAILURE
abort-all-jobs: false
@@
-78,10
+79,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,6
+95,8
@@
<<: *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-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-k8s-build-amd64-{stream}'
<<: *build-job-settings
- name: 'compass-tasks-osa-build-amd64-{stream}'
@@
-149,9
+152,9
@@
default: ""
description: "commit id to make a snapshot docker image"
- string:
default: ""
description: "commit id to make a snapshot docker image"
- string:
- name:
RELEASE_VERSION
+ name:
GERRIT_REFNAME
default: ""
default: ""
- description: "Docker tag to be built, e.g.
5.0.0, opnfv-5.0.0,
5.0.RC1"
+ description: "Docker tag to be built, e.g.
refs/tags/5.0.0, refs/tags/opnfv-5.0.0, refs/tags/
5.0.RC1"
- string:
name: DOCKERFILE
default: "Dockerfile"
- string:
name: DOCKERFILE
default: "Dockerfile"