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 "Convert puppet-fdio to be Packer compliant"
[ci-management.git]
/
jjb
/
ci-management
/
ci-management-jobs.yaml
diff --git
a/jjb/ci-management/ci-management-jobs.yaml
b/jjb/ci-management/ci-management-jobs.yaml
index
fbce13f
..
226d77f
100644
(file)
--- a/
jjb/ci-management/ci-management-jobs.yaml
+++ b/
jjb/ci-management/ci-management-jobs.yaml
@@
-26,14
+26,13
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit-trigger-patch-submitted:
triggers:
- gerrit-trigger-patch-submitted:
@@
-67,14
+66,13
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: ''
choosing-strategy: 'default'
wrappers:
refspec: ''
choosing-strategy: 'default'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit-trigger-patch-merged:
triggers:
- gerrit-trigger-patch-merged:
@@
-82,8
+80,10
@@
branch: '{branch}'
builders:
branch: '{branch}'
builders:
- - shell:
- !include-raw-escape: include-raw-jjb-update.sh
+ - shell: |
+ pip freeze
+ jenkins-jobs --version
+ jenkins-jobs update --recursive --delete-old --workers 4 jjb/
- job-template:
name: ci-management-verify-zuul
- job-template:
name: ci-management-verify-zuul
@@
-100,14
+100,13
@@
scm:
- zuul-trigger-scm:
scm:
- zuul-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$ZUUL_REF'
commit: '$ZUUL_COMMIT'
wrappers:
refspec: '$ZUUL_REF'
commit: '$ZUUL_COMMIT'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
builders:
- shell:
builders:
- shell:
@@
-127,14
+126,13
@@
scm:
- zuul-trigger-scm:
scm:
- zuul-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: ''
commit: 'origin/$ZUUL_BRANCH'
wrappers:
refspec: ''
commit: 'origin/$ZUUL_BRANCH'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
builders:
- shell:
builders:
- shell:
@@
-157,14
+155,13
@@
scm:
- zuul-trigger-scm:
scm:
- zuul-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$ZUUL_REF'
commit: '$ZUUL_COMMIT'
wrappers:
refspec: '$ZUUL_REF'
commit: '$ZUUL_COMMIT'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
builders:
- shell:
builders:
- shell:
@@
-184,14
+181,13
@@
scm:
- zuul-trigger-scm:
scm:
- zuul-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: ''
commit: 'origin/$ZUUL_BRANCH'
wrappers:
refspec: ''
commit: 'origin/$ZUUL_BRANCH'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
builders:
- shell:
builders:
- shell: