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 "Migrate docs-rtd to archive-builds macro"
[releng/builder.git]
/
jjb-templates
/
verify.yaml
diff --git
a/jjb-templates/verify.yaml
b/jjb-templates/verify.yaml
index 3947670d497f5140d687988558f52964aa4d11db..3e1c5a903d4fe8c681d0b2ee71b291bd8035de5b 100644
(file)
--- a/
jjb-templates/verify.yaml
+++ b/
jjb-templates/verify.yaml
@@
-24,30
+24,23
@@
values: '{obj:jdks}'
logrotate:
values: '{obj:jdks}'
logrotate:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
+ daysToKeep: '14'
parameters:
parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameters:
+ - opendaylight-infra-parameters:
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts}'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
- - build-timeout
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - opendaylight-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit-trigger-patch-submitted:
triggers:
- gerrit-trigger-patch-submitted:
@@
-55,19
+48,20
@@
branch: '{branch}'
builders:
branch: '{branch}'
builders:
- - wipe-org-opendaylight-repo
- jacoco-nojava-workaround
- provide-maven-settings:
- jacoco-nojava-workaround
- provide-maven-settings:
- global-settings-file: '
{odl-global-settings}
'
- settings-file: '
{JENKINS_SETTINGS}
'
+ global-settings-file: '
odl-global-settings
'
+ settings-file: '
JENKINS_SETTINGS
'
- maven-target:
maven-version: '{mvn33}'
pom: 'POM'
goals: 'MAVEN_GOALS -V -B -Djenkins -Dstream={stream}'
java-opts:
- 'MAVEN_OPTS'
- maven-target:
maven-version: '{mvn33}'
pom: 'POM'
goals: 'MAVEN_GOALS -V -B -Djenkins -Dstream={stream}'
java-opts:
- 'MAVEN_OPTS'
- settings: '{JENKINS_SETTINGS}'
- global-settings: '{odl-global-settings}'
+ settings: 'JENKINS_SETTINGS'
+ settings-type: cfp
+ global-settings: 'odl-global-settings'
+ global-settings-type: cfp
publishers:
ARCHIVE_ARTIFACTS
publishers:
ARCHIVE_ARTIFACTS
@@
-75,3
+69,5
@@
- email-notification:
email-prefix: '[PROJECT_SHORTNAME]'
- jacoco-report
- email-notification:
email-prefix: '[PROJECT_SHORTNAME]'
- jacoco-report
+ - archive-build:
+ maven-version: '{mvn33}'