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
Prevent unbound variable error on create-netrc.sh
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
fc49f52
..
988f893
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
@@
-86,6
+82,7
@@
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
+102,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
+122,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,7
+138,7
@@
branch: master
build-timeout: 10
branch: master
build-timeout: 10
- jjb-version:
1.6.2
+ jjb-version:
2.0.5
stream: master
submodule-recursive: true
stream: master
submodule-recursive: true
@@
-370,8
+367,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}'
@@
-468,6
+465,11
@@
branches:
- branch-compare-type: ANT
branch-pattern: '**/{branch}'
branches:
- branch-compare-type: ANT
branch-pattern: '**/{branch}'
+ 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'