Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Remove unnecessary ssh-credentials defaults"
[ci-management.git]
/
jjb
/
honeycomb
/
honeycomb.yaml
diff --git
a/jjb/honeycomb/honeycomb.yaml
b/jjb/honeycomb/honeycomb.yaml
index
beaacc2
..
bf037d5
100644
(file)
--- a/
jjb/honeycomb/honeycomb.yaml
+++ b/
jjb/honeycomb/honeycomb.yaml
@@
-10,6
+10,9
@@
- ubuntu1404:
repo-os-part: 'ubuntu.trusty.main'
skip-site: 'false'
- ubuntu1404:
repo-os-part: 'ubuntu.trusty.main'
skip-site: 'false'
+ - ubuntu1604:
+ repo-os-part: 'ubuntu.xenial.main'
+ skip-site: 'true'
- centos7:
repo-os-part: 'centos7'
skip-site: 'true'
- centos7:
repo-os-part: 'centos7'
skip-site: 'true'
@@
-26,6
+29,7
@@
project-type: maven
node: verify-{os}
concurrent: true
project-type: maven
node: verify-{os}
concurrent: true
+ jdk: openjdk8-{os}
logrotate:
daysToKeep: '{build-days-to-keep}'
logrotate:
daysToKeep: '{build-days-to-keep}'
@@
-43,14
+47,14
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
- ssh-agent-credentials:
users:
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
- ssh-agent-credentials:
users:
- - '
{ssh-credentials}
'
+ - '
jenkins-gerrit-credentials
'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-81,6
+85,7
@@
project-type: maven
node: 'verify-image-{os}'
concurrent: true
project-type: maven
node: 'verify-image-{os}'
concurrent: true
+ jdk: openjdk8-{os}
logrotate:
daysToKeep: '{build-days-to-keep}'
logrotate:
daysToKeep: '{build-days-to-keep}'
@@
-98,14
+103,14
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
- ssh-agent-credentials:
users:
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
- ssh-agent-credentials:
users:
- - '
{ssh-credentials}
'
+ - '
jenkins-gerrit-credentials
'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-168,14
+173,14
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: ''
choosing-strategy: 'default'
wrappers:
- ssh-agent-credentials:
users:
refspec: ''
choosing-strategy: 'default'
wrappers:
- ssh-agent-credentials:
users:
- - '
{ssh-credentials}
'
+ - '
jenkins-gerrit-credentials
'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-209,6
+214,7
@@
name: 'honeycomb-integration-{stream}-{os}'
project-type: maven
node: merge-{os}
name: 'honeycomb-integration-{stream}-{os}'
project-type: maven
node: merge-{os}
+ jdk: openjdk8-{os}
logrotate:
daysToKeep: '{build-days-to-keep}'
logrotate:
daysToKeep: '{build-days-to-keep}'
@@
-228,14
+234,14
@@
scm:
- git-scm:
scm:
- git-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: ''
branch: '{branch}'
wrappers:
- ssh-agent-credentials:
users:
refspec: ''
branch: '{branch}'
wrappers:
- ssh-agent-credentials:
users:
- - '
{ssh-credentials}
'
+ - '
jenkins-gerrit-credentials
'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'