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
Configurable Timed Trigger for Packer Merge Jobs
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
057f718
..
233fec4
100644
(file)
--- a/
jjb/lf-ci-jobs.yaml
+++ b/
jjb/lf-ci-jobs.yaml
@@
-20,8
+20,6
@@
- job-group:
name: '{project-name}-packer-jobs'
- job-group:
name: '{project-name}-packer-jobs'
- packer-version: 1.1.3
-
jobs:
- gerrit-packer-merge
- gerrit-packer-verify
jobs:
- gerrit-packer-merge
- gerrit-packer-verify
@@
-30,8
+28,6
@@
- job-group:
name: '{project-name}-github-packer-jobs'
- job-group:
name: '{project-name}-github-packer-jobs'
- packer-version: 1.1.3
-
jobs:
- github-packer-merge
- github-packer-verify
jobs:
- github-packer-merge
- github-packer-verify
@@
-83,9
+79,11
@@
branch: master
build-timeout: 90
branch: master
build-timeout: 90
+ cron: '@monthly'
stream: master
submodule-recursive: true
packer-cloud-settings: packer-cloud-env
stream: master
submodule-recursive: true
packer-cloud-settings: packer-cloud-env
+ packer-version: 1.2.2
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-105,7
+103,7
@@
stream: '{stream}'
branch: '{branch}'
lftools-version: '{lftools-version}'
stream: '{stream}'
branch: '{branch}'
lftools-version: '{lftools-version}'
- - lf-
infra-
packer-parameters:
+ - lf-packer-parameters:
packer-version: '{packer-version}'
wrappers:
packer-version: '{packer-version}'
wrappers:
@@
-125,7
+123,7
@@
description: Jenkins Job Builder version to download and install.
- parameter:
description: Jenkins Job Builder version to download and install.
- parameter:
- name: lf-
infra-
packer-parameters
+ name: lf-packer-parameters
parameters:
- string:
name: PACKER_VERSION
parameters:
- string:
name: PACKER_VERSION
@@
-141,13
+139,17
@@
branch: master
build-timeout: 10
branch: master
build-timeout: 10
- jjb-version: 2.0.
3
+ jjb-version: 2.0.
5
stream: master
submodule-recursive: true
gerrit_trigger_file_paths:
stream: master
submodule-recursive: true
gerrit_trigger_file_paths:
+ - compare-type: ANT
+ pattern: '**/*.groovy'
- compare-type: ANT
pattern: '**/*.sh'
- compare-type: ANT
pattern: '**/*.sh'
+ - compare-type: ANT
+ pattern: '**/*.yml'
- compare-type: ANT
pattern: '**/*.yaml'
- compare-type: ANT
- compare-type: ANT
pattern: '**/*.yaml'
- compare-type: ANT
@@
-370,8
+372,8
@@
scm:
- lf-infra-github-scm:
url: '{git-clone-url}{github-org}/{project}'
scm:
- lf-infra-github-scm:
url: '{git-clone-url}{github-org}/{project}'
- refspec: '
+refs/pull/*:refs/remotes/origin/pr/*
'
- branch: '
$sha1
'
+ refspec: ''
+ branch: '
refs/heads/{branch}
'
submodule-recursive: true
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
submodule-recursive: true
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-464,10
+466,15
@@
trigger-on: '{obj:gerrit_jjb_deploy_job_triggers}'
projects:
- project-compare-type: ANT
trigger-on: '{obj:gerrit_jjb_deploy_job_triggers}'
projects:
- project-compare-type: ANT
- project-pattern: '
{project}
'
+ project-pattern: '
**
'
branches:
- branch-compare-type: ANT
branches:
- branch-compare-type: ANT
- branch-pattern: '**/{branch}'
+ branch-pattern: '**'
+ skip-vote:
+ success: true
+ failed: true
+ unstable: true
+ notbuilt: true
- job-template:
name: '{project-name}-jjb-deploy-job'
- job-template:
name: '{project-name}-jjb-deploy-job'
@@
-525,6
+532,7
@@
- shell: !include-raw-escape:
- ../shell/jjb-install.sh
- ../shell/jjb-merge-job.sh
- shell: !include-raw-escape:
- ../shell/jjb-install.sh
- ../shell/jjb-merge-job.sh
+ - ../shell/jjb-cleanup.sh
- job-template:
name: '{project-name}-jjb-merge'
- job-template:
name: '{project-name}-jjb-merge'
@@
-623,6
+631,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
+ - ../shell/jjb-cleanup.sh
- lf-infra-gpg-verify-git-signature
- job-template:
- lf-infra-gpg-verify-git-signature
- job-template:
@@
-737,7
+746,7
@@
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
- - timed: '
00 10 1 * *
'
+ - timed: '
{cron}
'
- gerrit:
server-name: '{gerrit-server-name}'
trigger-on: '{obj:gerrit_merge_triggers}'
- gerrit:
server-name: '{gerrit-server-name}'
trigger-on: '{obj:gerrit_merge_triggers}'
@@
-770,7
+779,7
@@
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
- - timed: '
00 10 1 * *
'
+ - timed: '
{cron}
'
- github
- pollscm:
cron: ''
- github
- pollscm:
cron: ''