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
00acc00
..
328c65a
100644
(file)
--- a/
jjb/lf-release-jobs.yaml
+++ b/
jjb/lf-release-jobs.yaml
@@
-39,11
+39,6
@@
branch: "$GERRIT_BRANCH"
stream: "$GERRIT_BRANCH"
branch: "$GERRIT_BRANCH"
stream: "$GERRIT_BRANCH"
- wrappers:
- - lf-infra-wrappers:
- build-timeout: "{build-timeout}"
- jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
-
publishers:
- lf-infra-publish
publishers:
- lf-infra-publish
@@
-102,6
+97,11
@@
# yamllint disable-line rule:key-duplicates
<<: *lf_release_verify
# 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}"
scm:
- lf-infra-gerrit-scm:
git-url: "{git-url}"
@@
-111,7
+111,7
@@
submodule-recursive: false
submodule-timeout: 10
choosing-strategy: gerrit
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:
@@
-180,9
+180,14
@@
# yamllint disable-line rule:key-duplicates
<<: *lf_release_merge
# 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"