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
Add a check before running the sysstat script
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
5651f51
..
cc87260
100644
(file)
--- a/
jjb/lf-ci-jobs.yaml
+++ b/
jjb/lf-ci-jobs.yaml
@@
-60,7
+60,7
@@
- ../shell/jjb-install.sh
- ../shell/jjb-verify-job.sh
- ../shell/jjb-check-unicode.sh
- ../shell/jjb-install.sh
- ../shell/jjb-verify-job.sh
- ../shell/jjb-check-unicode.sh
- - gpg-verify-git-signature
+ -
lf-infra-
gpg-verify-git-signature
- parameter:
name: lf-infra-jjb-parameters
- parameter:
name: lf-infra-jjb-parameters
@@
-120,13
+120,24
@@
# yamllint disable-line rule:key-duplicates
<<: *lf_jjb_merge_builders
# yamllint disable-line rule:key-duplicates
<<: *lf_jjb_merge_builders
+ ######################
+ # Default parameters #
+ ######################
+
+ git-url: '$GIT_URL/$GERRIT_PROJECT'
+
+ #####################
+ # Job Configuration #
+ #####################
+
scm:
- lf-infra-gerrit-scm:
scm:
- lf-infra-gerrit-scm:
-
jenkins-ssh-credential: '{jenkins-ssh-credentia
l}'
+
git-url: '{git-ur
l}'
refspec: ''
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
refspec: ''
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
+ jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
- gerrit:
triggers:
- gerrit:
@@
-151,8
+162,19
@@
# yamllint disable-line rule:key-duplicates
<<: *lf_jjb_verify_builders
# yamllint disable-line rule:key-duplicates
<<: *lf_jjb_verify_builders
+ ######################
+ # Default parameters #
+ ######################
+
+ git-url: '$GIT_URL/$GERRIT_PROJECT'
+
+ #####################
+ # Job Configuration #
+ #####################
+
scm:
- lf-infra-gerrit-scm:
scm:
- lf-infra-gerrit-scm:
+ git-url: '{git-url}'
refspec: '$GERRIT_REFSPEC'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
refspec: '$GERRIT_REFSPEC'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
@@
-185,24
+207,18
@@
# yamllint disable-line rule:key-duplicates
<<: *lf_jjb_merge_builders
# yamllint disable-line rule:key-duplicates
<<: *lf_jjb_merge_builders
- ######################
- # Default parameters #
- ######################
-
- github-url: https://github.com
-
#####################
# Job Configuration #
#####################
properties:
- github:
#####################
# Job Configuration #
#####################
properties:
- github:
- url: '{git
hub
-url}/{github-org}/{project}'
+ url: '{git-url}/{github-org}/{project}'
scm:
- lf-infra-github-scm:
scm:
- lf-infra-github-scm:
- url: '
{github-url}/
{github-org}/{project}'
- refspec: '
+refs/pull/*:refs/remotes/origin/pr/*
'
+ url: '
${{GIT_CLONE_URL}}
{github-org}/{project}'
+ refspec: ''
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
@@
-225,27
+241,22
@@
- job-template:
name: '{project-name}-jjb-verify'
id: github-jjb-verify
- job-template:
name: '{project-name}-jjb-verify'
id: github-jjb-verify
+ concurrent: true
<<: *lf_jjb_verify_merge
# yamllint disable-line rule:key-duplicates
<<: *lf_jjb_merge_builders
<<: *lf_jjb_verify_merge
# yamllint disable-line rule:key-duplicates
<<: *lf_jjb_merge_builders
- ######################
- # Default parameters #
- ######################
-
- github-url: https://github.com
-
#####################
# Job Configuration #
#####################
properties:
- github:
#####################
# Job Configuration #
#####################
properties:
- github:
- url: '{git
hub
-url}/{github-org}/{project}'
+ url: '{git-url}/{github-org}/{project}'
scm:
- lf-infra-github-scm:
scm:
- lf-infra-github-scm:
- url: '
{github-url}/
{github-org}/{project}'
+ url: '
${{GIT_CLONE_URL}}
{github-org}/{project}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'