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
Switch integration jobs to use mvn35
[releng/builder.git]
/
jjb
/
packaging
/
puppet.yaml
diff --git
a/jjb/packaging/puppet.yaml
b/jjb/packaging/puppet.yaml
index acfc7c345bb957d5fffdcf83b5854b2c15917228..0ec0a7b3812c748990d306ded38cf6ad0da2d566 100644
(file)
--- a/
jjb/packaging/puppet.yaml
+++ b/
jjb/packaging/puppet.yaml
@@
-4,20
+4,26
@@
project-name: puppet
jobs:
project-name: puppet
jobs:
- - '{project-name}-
verify-tox
-{stream}'
- - '
puppet-test-sanity
-{stream}'
- -
'puppet-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'
+ - oxygen:
+ branch: 'stable/oxygen'
+ - nitrogen:
+ branch: 'stable/nitrogen'
+ - carbon:
+ branch: 'stable/carbon'
- job-template:
- job-template:
- name: '
puppet
-test-sanity-{stream}'
+ name: '
{project-name}
-test-sanity-{stream}'
- node: centos7-docker-
2
c-4g
+ node: centos7-docker-
1
c-4g
project-type: freestyle
project-type: freestyle
@@
-48,19
+54,23
@@
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:
triggers:
+ - timed: '@weekly'
- gerrit-trigger-patch-submitted:
- gerrit-trigger-patch-submitted:
-
server: '{
server-name}'
+
gerrit-server-name: '{gerrit-
server-name}'
project: '{project}'
branch: '{branch}'
files: '**'
project: '{project}'
branch: '{branch}'
files: '**'
+ publishers:
+ - lf-infra-publish
+
- job-template:
- job-template:
- name: '
puppet
-test-full-{stream}'
+ name: '
{project-name}
-test-full-{stream}'
- node: centos7-docker-
2
c-4g
+ node: centos7-docker-
1
c-4g
project-type: freestyle
project-type: freestyle
@@
-77,7
+87,7
@@
artifacts: '{archive-artifacts}'
- string:
name: TEST_SUITE
artifacts: '{archive-artifacts}'
- string:
name: TEST_SUITE
- default: 'acceptance
6
_dock'
+ default: 'acceptance_dock'
description: 'Set of tests to execute, Rakefile task'
scm:
description: 'Set of tests to execute, Rakefile task'
scm:
@@
-91,12
+101,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'
@@
-106,8
+116,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