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 "[storperf] Add stable/fraser branch"
[releng.git]
/
jjb
/
releng
/
compass4nfv-docker.yml
diff --git
a/jjb/releng/compass4nfv-docker.yml
b/jjb/releng/compass4nfv-docker.yml
index
db2e427
..
5fbb37c
100644
(file)
--- a/
jjb/releng/compass4nfv-docker.yml
+++ b/
jjb/releng/compass4nfv-docker.yml
@@
-27,6
+27,8
@@
- 'db'
- 'deck'
- 'tasks-base'
- 'db'
- 'deck'
- 'tasks-base'
+ - 'tasks-k8s'
+ - 'tasks-osa'
# 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
@@
-36,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
@@
-95,6
+97,10
@@
<<: *build-job-settings
- name: 'compass-tasks-build-amd64-{stream}'
<<: *build-job-settings
<<: *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}'
+ <<: *build-job-settings
publishers:
- 'compass-amd64-recipients'
publishers:
- 'compass-amd64-recipients'
@@
-146,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"