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
dc3807a
..
29deaca
100644
(file)
--- a/
jjb/lf-release-jobs.yaml
+++ b/
jjb/lf-release-jobs.yaml
@@
-14,20
+14,12
@@
- 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 #
#####################
project-type: freestyle
#####################
# Job Configuration #
#####################
project-type: freestyle
- node:
'{build-node}'
+ node:
"{build-node}"
properties:
- lf-infra-properties:
properties:
- lf-infra-properties:
@@
-35,14
+27,11
@@
parameters:
- lf-infra-parameters:
parameters:
- lf-infra-parameters:
- project: '{project}'
- branch: 'master'
- stream: '{stream}'
-
- wrappers:
- - lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ project: "{project}"
+ 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,14
+47,12
@@
# 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
- git-url: '$GIT_URL/$PROJECT'
- project-pattern: '**'
+ git-url: "$GIT_URL/$PROJECT"
gerrit-skip-vote: false
gerrit-skip-vote: false
+ use-release-file: true
gerrit_verify_triggers:
- patchset-created-event:
gerrit_verify_triggers:
- patchset-created-event:
@@
-76,12
+63,11
@@
- comment-added-contains-event:
comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
- comment-added-contains-event:
comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
-
#####################
# Job Configuration #
#####################
#####################
# Job Configuration #
#####################
- disabled:
'{disable-job}'
+ disabled:
"{disable-job}"
builders:
- lf-infra-pre-build
builders:
- lf-infra-pre-build
@@
-93,45
+79,53
@@
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:
scm:
- lf-infra-gerrit-scm:
- git-url:
'{git-url}'
- refspec:
'$GERRIT_REFSPEC'
- branch:
'master'
+ git-url:
"{git-url}"
+ refspec:
"$GERRIT_REFSPEC"
+ 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-credential}'
+ jenkins-ssh-credential:
"{jenkins-ssh-credential}"
triggers:
- gerrit:
triggers:
- gerrit:
- server-name:
'{gerrit-server-name}'
- trigger-on:
'{obj:gerrit_verify_triggers}'
+ server-name:
"{gerrit-server-name}"
+ trigger-on:
"{obj:gerrit_verify_triggers}"
projects:
projects:
- - project-compare-type:
'ANT'
- project-pattern:
'{project-pattern}'
+ - project-compare-type:
"ANT"
+ project-pattern:
"{project}"
branches:
branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
- file-paths: '{obj:gerrit_trigger_file_paths}'
+ - branch-compare-type: "ANT"
+ branch-pattern: "**"
+ file-paths:
+ - compare-type: ANT
+ pattern: "releases/*.yaml"
skip-vote:
skip-vote:
- successful: '{gerrit-skip-vote}'
- failed: '{gerrit-skip-vote}'
- unstable: '{gerrit-skip-vote}'
- notbuilt: '{gerrit-skip-vote}'
-
+ successful: "{gerrit-skip-vote}"
+ failed: "{gerrit-skip-vote}"
+ unstable: "{gerrit-skip-vote}"
+ notbuilt: "{gerrit-skip-vote}"
#################
# RELEASE MERGE #
#################
# RELEASE MERGE #
@@
-144,13
+138,11
@@
# 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
- git-url:
'$GIT_URL/$PROJECT'
- project-pattern: '**'
+ git-url:
"$GIT_URL/$PROJECT"
+ use-release-file: true
gerrit_merge_triggers:
- change-merged-event
gerrit_merge_triggers:
- change-merged-event
@@
-161,7
+153,7
@@
# Job Configuration #
#####################
# Job Configuration #
#####################
- disabled:
'{disable-job}'
+ disabled:
"{disable-job}"
builders:
- lf-infra-pre-build
builders:
- lf-infra-pre-build
@@
-173,23
+165,30
@@
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:
scm:
- lf-infra-gerrit-scm:
- jenkins-ssh-credential:
'{jenkins-ssh-credential}'
- git-url:
'{git-url}'
- refspec:
'$GERRIT_REFSPEC'
- branch:
'$GERRIT_BRANCH'
+ jenkins-ssh-credential:
"{jenkins-ssh-credential}"
+ git-url:
"{git-url}"
+ refspec:
"$GERRIT_REFSPEC"
+ branch:
"$GERRIT_BRANCH"
submodule-disable: true
submodule-recursive: false
submodule-timeout: 10
submodule-disable: true
submodule-recursive: false
submodule-timeout: 10
@@
-197,12
+196,14
@@
triggers:
- gerrit:
triggers:
- gerrit:
- server-name:
'{gerrit-server-name}'
- trigger-on:
'{obj:gerrit_merge_triggers}'
+ server-name:
"{gerrit-server-name}"
+ trigger-on:
"{obj:gerrit_merge_triggers}"
projects:
projects:
- - project-compare-type:
'ANT'
- project-pattern:
'{project-pattern}'
+ - project-compare-type:
"ANT"
+ project-pattern:
"{project}"
branches:
branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
- file-paths: '{obj:gerrit_trigger_file_paths}'
+ - branch-compare-type: "ANT"
+ branch-pattern: "**"
+ file-paths:
+ - compare-type: ANT
+ pattern: "releases/*.yaml"