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
Update submodule documentation
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
063b4b7
..
2bff633
100644
(file)
--- a/
jjb/lf-ci-jobs.yaml
+++ b/
jjb/lf-ci-jobs.yaml
@@
-2,8
+2,6
@@
- job-group:
name: '{project-name}-ci-jobs'
- job-group:
name: '{project-name}-ci-jobs'
- jjb-version: 1.6.2
-
jobs:
- gerrit-jjb-deploy-job
- gerrit-jjb-merge
jobs:
- gerrit-jjb-deploy-job
- gerrit-jjb-merge
@@
-12,8
+10,6
@@
- job-group:
name: '{project-name}-github-ci-jobs'
- job-group:
name: '{project-name}-github-ci-jobs'
- jjb-version: 1.6.2
-
jobs:
- github-jjb-deploy-job
- github-jjb-merge
jobs:
- github-jjb-deploy-job
- github-jjb-merge
@@
-22,7
+18,7
@@
- job-group:
name: '{project-name}-packer-jobs'
- job-group:
name: '{project-name}-packer-jobs'
- packer-version: 1.1.
1
+ packer-version: 1.1.
3
jobs:
- gerrit-packer-merge
jobs:
- gerrit-packer-merge
@@
-32,7
+28,7
@@
- job-group:
name: '{project-name}-github-packer-jobs'
- job-group:
name: '{project-name}-github-packer-jobs'
- packer-version: 1.1.
1
+ packer-version: 1.1.
3
jobs:
- github-packer-merge
jobs:
- github-packer-merge
@@
-62,13
+58,14
@@
- lf_packer_file_paths: &lf_packer_file_paths
name: lf-packer-file-paths
file-paths:
- lf_packer_file_paths: &lf_packer_file_paths
name: lf-packer-file-paths
file-paths:
- # Common files for all projects
- compare-type: ANT
pattern: 'packer/vars/{platforms}.json'
- compare-type: ANT
pattern: 'packer/templates/{templates}.json'
- compare-type: ANT
- compare-type: ANT
pattern: 'packer/vars/{platforms}.json'
- compare-type: ANT
pattern: 'packer/templates/{templates}.json'
- compare-type: ANT
- pattern: 'packer/provision/{templates}.sh'
+ pattern: 'packer/provision/*.sh'
+ - compare-type: ANT
+ pattern: 'packer/provision/{templates}.yaml'
- compare-type: ANT
pattern: 'packer/provision/lib/**'
- compare-type: ANT
pattern: 'packer/provision/lib/**'
@@
-81,7
+78,7
@@
######################
branch: master
######################
branch: master
- build-timeout:
45
+ build-timeout:
90
stream: master
submodule-recursive: true
packer-cloud-settings: packer-cloud-env
stream: master
submodule-recursive: true
packer-cloud-settings: packer-cloud-env
@@
-140,6
+137,7
@@
branch: master
build-timeout: 10
branch: master
build-timeout: 10
+ jjb-version: 1.6.2
stream: master
submodule-recursive: true
stream: master
submodule-recursive: true
@@
-266,7
+264,7
@@
stream: master
gerrit_jjb_deploy_job_triggers:
- comment-added-contains-event:
stream: master
gerrit_jjb_deploy_job_triggers:
- comment-added-contains-event:
- comment-contains-value:
jjb-deploy (?!\*+$).+$
+ comment-contains-value:
'jjb-deploy[:]* (?!\*+$).+$'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-340,7
+338,7
@@
- lf-infra-github-scm:
url: '{git-clone-url}{github-org}/{project}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
- lf-infra-github-scm:
url: '{git-clone-url}{github-org}/{project}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
- branch: '
{branch}
'
+ branch: '
$sha1
'
submodule-recursive: true
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
submodule-recursive: true
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-429,7
+427,7
@@
- lf-infra-github-scm:
url: '{git-clone-url}{github-org}/{project}'
refspec: ''
- lf-infra-github-scm:
url: '{git-clone-url}{github-org}/{project}'
refspec: ''
- branch: '{branch}'
+ branch: '
refs/heads/
{branch}'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-528,7
+526,7
@@
- lf-infra-github-scm:
url: '{git-clone-url}{github-org}/{project}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
- lf-infra-github-scm:
url: '{git-clone-url}{github-org}/{project}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
- branch: '
{branch}
'
+ branch: '
$sha1
'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-622,7
+620,7
@@
- lf-infra-github-scm:
url: '{git-clone-url}{github-org}/{project}'
refspec: ''
- lf-infra-github-scm:
url: '{git-clone-url}{github-org}/{project}'
refspec: ''
- branch: '{branch}'
+ branch: '
refs/heads/
{branch}'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-730,7
+728,7
@@
- lf-infra-github-scm:
url: '{git-clone-url}{github-org}/{project}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
- lf-infra-github-scm:
url: '{git-clone-url}{github-org}/{project}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
- branch: '
{branch}
'
+ branch: '
$sha1
'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'