Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Remove yangtools carbon jobs"
[releng/builder.git]
/
jjb
/
packaging
/
puppet.yaml
diff --git
a/jjb/packaging/puppet.yaml
b/jjb/packaging/puppet.yaml
index ece33cf8e72ff420e44bd683b84764f3a21e573b..5ef7d58efb1af09a798d0768477f4319a98e8e05 100644
(file)
--- a/
jjb/packaging/puppet.yaml
+++ b/
jjb/packaging/puppet.yaml
@@
-4,24
+4,24
@@
project-name: puppet
jobs:
project-name: puppet
jobs:
- - '{project-name}-verify-tox-{stream}'
- '{project-name}-test-sanity-{stream}'
- '{project-name}-test-full-{stream}'
- '{project-name}-test-sanity-{stream}'
- '{project-name}-test-full-{stream}'
+ - gerrit-tox-verify
project: 'integration/packaging/puppet-opendaylight'
stream:
- master:
branch: 'master'
project: 'integration/packaging/puppet-opendaylight'
stream:
- master:
branch: 'master'
- -
carbo
n:
- branch: 'stable/
carbo
n'
- -
boro
n:
- branch: 'stable/
boro
n'
+ -
oxyge
n:
+ branch: 'stable/
oxyge
n'
+ -
nitroge
n:
+ branch: 'stable/
nitroge
n'
- job-template:
name: '{project-name}-test-sanity-{stream}'
- job-template:
name: '{project-name}-test-sanity-{stream}'
- node: centos7-docker-
2
c-4g
+ node: centos7-docker-
1
c-4g
project-type: freestyle
project-type: freestyle
@@
-52,12
+52,12
@@
build-timeout: '{build-timeout}'
builders:
build-timeout: '{build-timeout}'
builders:
- - shell: !include-raw:
include-raw-
test-puppet.sh
+ - shell: !include-raw: test-puppet.sh
triggers:
- timed: '@weekly'
- gerrit-trigger-patch-submitted:
triggers:
- timed: '@weekly'
- gerrit-trigger-patch-submitted:
-
server: '{
server-name}'
+
gerrit-server-name: '{gerrit-
server-name}'
project: '{project}'
branch: '{branch}'
files: '**'
project: '{project}'
branch: '{branch}'
files: '**'
@@
-68,7
+68,7
@@
- job-template:
name: '{project-name}-test-full-{stream}'
- job-template:
name: '{project-name}-test-full-{stream}'
- node: centos7-docker-
2
c-4g
+ node: centos7-docker-
1
c-4g
project-type: freestyle
project-type: freestyle
@@
-99,12
+99,12
@@
build-timeout: '{build-timeout}'
builders:
build-timeout: '{build-timeout}'
builders:
- - shell: !include-raw:
include-raw-
test-puppet.sh
+ - shell: !include-raw: test-puppet.sh
triggers:
- timed: '@daily'
- gerrit:
triggers:
- timed: '@daily'
- gerrit:
- server-name: '{server-name}'
+ server-name: '{
gerrit-
server-name}'
trigger-on:
- comment-added-contains-event:
comment-contains-value: 'puppet-test-full'
trigger-on:
- comment-added-contains-event:
comment-contains-value: 'puppet-test-full'
@@
-114,11
+114,6
@@
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
- skip-vote:
- successful: true
- failed: true
- unstable: true
- notbuilt: true
publishers:
- lf-infra-publish
publishers:
- lf-infra-publish