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
/
vpp
/
vpp.yaml
diff --git
a/jjb/vpp/vpp.yaml
b/jjb/vpp/vpp.yaml
index
99c27b6
..
3310efb
100644
(file)
--- a/
jjb/vpp/vpp.yaml
+++ b/
jjb/vpp/vpp.yaml
@@
-82,7
+82,7
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
@@
-90,7
+90,7
@@
- timestamps
- ssh-agent-credentials:
users:
- timestamps
- ssh-agent-credentials:
users:
- - '
{ssh-credentials}
'
+ - '
jenkins-gerrit-credentials
'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-201,7
+201,7
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
@@
-209,7
+209,7
@@
- timestamps
- ssh-agent-credentials:
users:
- timestamps
- ssh-agent-credentials:
users:
- - '
{ssh-credentials}
'
+ - '
jenkins-gerrit-credentials
'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-257,13
+257,13
@@
- os-parameter:
os: '{os}'
- maven-project-parameter:
- os-parameter:
os: '{os}'
- maven-project-parameter:
- maven: '
{mvn33}
'
+ maven: '
mvn33
'
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
scm:
- gerrit-trigger-scm:
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: ''
choosing-strategy: 'default'
refspec: ''
choosing-strategy: 'default'
@@
-271,7
+271,7
@@
- timestamps
- ssh-agent-credentials:
users:
- timestamps
- ssh-agent-credentials:
users:
- - '
{ssh-credentials}
'
+ - '
jenkins-gerrit-credentials
'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-286,7
+286,7
@@
- shell:
!include-raw-escape: include-raw-vpp-build.sh
- maven-target:
- shell:
!include-raw-escape: include-raw-vpp-build.sh
- maven-target:
- maven-version: '
{mvn33}
'
+ maven-version: '
mvn33
'
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
@@
-330,7
+330,7
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
@@
-338,7
+338,7
@@
- timestamps
- ssh-agent-credentials:
users:
- timestamps
- ssh-agent-credentials:
users:
- - '
{ssh-credentials}
'
+ - '
jenkins-gerrit-credentials
'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-388,7
+388,7
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
@@
-396,7
+396,7
@@
- timestamps
- ssh-agent-credentials:
users:
- timestamps
- ssh-agent-credentials:
users:
- - '
{ssh-credentials}
'
+ - '
jenkins-gerrit-credentials
'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-452,7
+452,7
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
@@
-460,7
+460,7
@@
- timestamps
- ssh-agent-credentials:
users:
- timestamps
- ssh-agent-credentials:
users:
- - '
{ssh-credentials}
'
+ - '
jenkins-gerrit-credentials
'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-471,7
+471,7
@@
builders:
- maven-target:
builders:
- maven-target:
- maven-version: '
{mvn33}
'
+ maven-version: '
mvn33
'
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
@@
-513,7
+513,7
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: ''
choosing-strategy: 'default'
refspec: ''
choosing-strategy: 'default'
@@
-521,7
+521,7
@@
- timestamps
- ssh-agent-credentials:
users:
- timestamps
- ssh-agent-credentials:
users:
- - '
{ssh-credentials}
'
+ - '
jenkins-gerrit-credentials
'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-548,7
+548,7
@@
builders:
- maven-target:
builders:
- maven-target:
- maven-version: '
{mvn33}
'
+ maven-version: '
mvn33
'
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp