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
Allow Build with Params releases
[releng/global-jjb.git]
/
jjb
/
lf-release-jobs.yaml
diff --git
a/jjb/lf-release-jobs.yaml
b/jjb/lf-release-jobs.yaml
index
908881e
..
29deaca
100644
(file)
--- a/
jjb/lf-release-jobs.yaml
+++ b/
jjb/lf-release-jobs.yaml
@@
-14,14
+14,6
@@
- lf_release_common: &lf_release_common
name: lf-release-common
- lf_release_common: &lf_release_common
name: lf-release-common
- ######################
- # Default parameters #
- ######################
-
- gerrit_trigger_file_paths:
- - compare-type: ANT
- pattern: "releases/*.yaml"
-
#####################
# Job Configuration #
#####################
#####################
# Job Configuration #
#####################
@@
-36,13
+28,10
@@
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-credential}"
+ branch: "$GERRIT_BRANCH"
+ stream: "$GERRIT_BRANCH"
+ - lf-build-with-parameters-maven-release:
+ use-release-file: "{use-release-file}"
publishers:
- lf-infra-publish
publishers:
- lf-infra-publish
@@
-58,13
+47,12
@@
# Default parameters #
######################
# Default parameters #
######################
- branch: master
- stream: master
build-days-to-keep: 7
build-timeout: 15
disable-job: false
git-url: "$GIT_URL/$PROJECT"
gerrit-skip-vote: false
build-days-to-keep: 7
build-timeout: 15
disable-job: false
git-url: "$GIT_URL/$PROJECT"
gerrit-skip-vote: false
+ use-release-file: true
gerrit_verify_triggers:
- patchset-created-event:
gerrit_verify_triggers:
- patchset-created-event:
@@
-91,22
+79,29
@@
variable: SIGUL_PASSWORD
- file-id: sigul-pki
variable: SIGUL_PKI
variable: SIGUL_PASSWORD
- file-id: sigul-pki
variable: SIGUL_PKI
+ - file-id: signing-pubkey
+ variable: SIGNING_PUBKEY
- shell: !include-raw-escape: ../shell/sigul-configuration.sh
- shell: !include-raw-escape: ../shell/sigul-install.sh
- lf-release
- job-template:
- shell: !include-raw-escape: ../shell/sigul-configuration.sh
- shell: !include-raw-escape: ../shell/sigul-install.sh
- 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
submodule-disable: true
submodule-recursive: false
submodule-timeout: 10
@@
-122,8
+117,10
@@
project-pattern: "{project}"
branches:
- branch-compare-type: "ANT"
project-pattern: "{project}"
branches:
- branch-compare-type: "ANT"
- branch-pattern: "**/master"
- file-paths: "{obj:gerrit_trigger_file_paths}"
+ branch-pattern: "**"
+ file-paths:
+ - compare-type: ANT
+ pattern: "releases/*.yaml"
skip-vote:
successful: "{gerrit-skip-vote}"
failed: "{gerrit-skip-vote}"
skip-vote:
successful: "{gerrit-skip-vote}"
failed: "{gerrit-skip-vote}"
@@
-141,12
+138,11
@@
# Default parameters #
######################
# Default parameters #
######################
- branch: master
- stream: master
build-days-to-keep: 7
build-timeout: 15
disable-job: false
git-url: "$GIT_URL/$PROJECT"
build-days-to-keep: 7
build-timeout: 15
disable-job: false
git-url: "$GIT_URL/$PROJECT"
+ use-release-file: true
gerrit_merge_triggers:
- change-merged-event
gerrit_merge_triggers:
- change-merged-event
@@
-169,17
+165,24
@@
variable: SIGUL_PASSWORD
- file-id: sigul-pki
variable: SIGUL_PKI
variable: SIGUL_PASSWORD
- file-id: sigul-pki
variable: SIGUL_PKI
+ - file-id: signing-pubkey
+ variable: SIGNING_PUBKEY
- shell: !include-raw-escape: ../shell/sigul-configuration.sh
- shell: !include-raw-escape: ../shell/sigul-install.sh
- lf-release
- job-template:
- shell: !include-raw-escape: ../shell/sigul-configuration.sh
- shell: !include-raw-escape: ../shell/sigul-install.sh
- 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:
jenkins-ssh-credential: "{jenkins-ssh-credential}"
scm:
- lf-infra-gerrit-scm:
jenkins-ssh-credential: "{jenkins-ssh-credential}"
@@
-200,5
+203,7
@@
project-pattern: "{project}"
branches:
- branch-compare-type: "ANT"
project-pattern: "{project}"
branches:
- branch-compare-type: "ANT"
- branch-pattern: "**/master"
- file-paths: "{obj:gerrit_trigger_file_paths}"
+ branch-pattern: "**"
+ file-paths:
+ - compare-type: ANT
+ pattern: "releases/*.yaml"