Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Use release credentials only for merge job wrappers"
[releng/global-jjb.git]
/
jjb
/
lf-release-jobs.yaml
diff --git
a/jjb/lf-release-jobs.yaml
b/jjb/lf-release-jobs.yaml
index
f016e37
..
328c65a
100644
(file)
--- a/
jjb/lf-release-jobs.yaml
+++ b/
jjb/lf-release-jobs.yaml
@@
-36,13
+36,8
@@
parameters:
- lf-infra-parameters:
project: "{project}"
parameters:
- lf-infra-parameters:
project: "{project}"
- branch: "master"
- stream: "{stream}"
-
- wrappers:
- - lf-infra-wrappers:
- build-timeout: "{build-timeout}"
- jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
+ branch: "$GERRIT_BRANCH"
+ stream: "$GERRIT_BRANCH"
publishers:
- lf-infra-publish
publishers:
- lf-infra-publish
@@
-58,8
+53,6
@@
# Default parameters #
######################
# Default parameters #
######################
- branch: master
- stream: master
build-days-to-keep: 7
build-timeout: 15
disable-job: false
build-days-to-keep: 7
build-timeout: 15
disable-job: false
@@
-98,22
+91,27
@@
- lf-release
- job-template:
- lf-release
- job-template:
- name: "{project-name}-release-verify
-{stream}
"
+ name: "{project-name}-release-verify"
id: gerrit-release-verify
<<: *lf_release_common
# yamllint disable-line rule:key-duplicates
<<: *lf_release_verify
id: gerrit-release-verify
<<: *lf_release_common
# yamllint disable-line rule:key-duplicates
<<: *lf_release_verify
+ wrappers:
+ - lf-infra-wrappers:
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
scm:
- lf-infra-gerrit-scm:
git-url: "{git-url}"
refspec: "$GERRIT_REFSPEC"
scm:
- lf-infra-gerrit-scm:
git-url: "{git-url}"
refspec: "$GERRIT_REFSPEC"
- branch: "
master
"
+ branch: "
$GERRIT_BRANCH
"
submodule-disable: true
submodule-recursive: false
submodule-timeout: 10
choosing-strategy: gerrit
submodule-disable: true
submodule-recursive: false
submodule-timeout: 10
choosing-strategy: gerrit
- jenkins-ssh-credential: "{jenkins-ssh-
release-
credential}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
triggers:
- gerrit:
triggers:
- gerrit:
@@
-124,7
+122,7
@@
project-pattern: "{project}"
branches:
- branch-compare-type: "ANT"
project-pattern: "{project}"
branches:
- branch-compare-type: "ANT"
- branch-pattern: "**
/master
"
+ branch-pattern: "**"
file-paths: "{obj:gerrit_trigger_file_paths}"
skip-vote:
successful: "{gerrit-skip-vote}"
file-paths: "{obj:gerrit_trigger_file_paths}"
skip-vote:
successful: "{gerrit-skip-vote}"
@@
-143,8
+141,6
@@
# Default parameters #
######################
# Default parameters #
######################
- branch: master
- stream: master
build-days-to-keep: 7
build-timeout: 15
disable-job: false
build-days-to-keep: 7
build-timeout: 15
disable-job: false
@@
-178,15
+174,20
@@
- lf-release
- job-template:
- lf-release
- job-template:
- name: "{project-name}-release-merge
-{stream}
"
+ name: "{project-name}-release-merge"
id: gerrit-release-merge
<<: *lf_release_common
# yamllint disable-line rule:key-duplicates
<<: *lf_release_merge
id: gerrit-release-merge
<<: *lf_release_common
# yamllint disable-line rule:key-duplicates
<<: *lf_release_merge
+ wrappers:
+ - lf-infra-wrappers:
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
+
scm:
- lf-infra-gerrit-scm:
scm:
- lf-infra-gerrit-scm:
- jenkins-ssh-credential: "{jenkins-ssh-
release-
credential}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
git-url: "{git-url}"
refspec: "$GERRIT_REFSPEC"
branch: "$GERRIT_BRANCH"
git-url: "{git-url}"
refspec: "$GERRIT_REFSPEC"
branch: "$GERRIT_BRANCH"
@@
-204,5
+205,5
@@
project-pattern: "{project}"
branches:
- branch-compare-type: "ANT"
project-pattern: "{project}"
branches:
- branch-compare-type: "ANT"
- branch-pattern: "**
/master
"
+ branch-pattern: "**"
file-paths: "{obj:gerrit_trigger_file_paths}"
file-paths: "{obj:gerrit_trigger_file_paths}"