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
Rename jenkins ssh-agent-credential
[releng/builder.git]
/
jjb
/
integration
/
distribution
/
distribution.yaml
diff --git
a/jjb/integration/distribution/distribution.yaml
b/jjb/integration/distribution/distribution.yaml
index db7edd46b9da3b2fb474ecb492f77f6ea4c200e5..d5dc9f06a744b8668e8fef8c5b4edf92488aa170 100644
(file)
--- a/
jjb/integration/distribution/distribution.yaml
+++ b/
jjb/integration/distribution/distribution.yaml
@@
-58,15
+58,12
@@
scm:
- git-scm:
scm:
- git-scm:
- credentials-id: '{ssh-credentials}'
refspec: ''
branch: 'master'
wrappers:
refspec: ''
branch: 'master'
wrappers:
- - build-timeout
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - opendaylight-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- timed: 'H H * * 6'
triggers:
- timed: 'H H * * 6'
@@
-74,19
+71,20
@@
name: 'integration/distribution'
prebuilders:
name: 'integration/distribution'
prebuilders:
- - wipe-org-opendaylight-repo
- jacoco-nojava-workaround
- provide-maven-settings:
- jacoco-nojava-workaround
- provide-maven-settings:
- global-settings-file: '
{odl-global-settings}
'
- settings-file: '
{integration-distribution-settings}
'
+ global-settings-file: '
odl-global-settings
'
+ settings-file: '
integration-distribution-settings
'
maven:
maven-name: '{mvn33}'
root-pom: 'pom.xml'
maven:
maven-name: '{mvn33}'
root-pom: 'pom.xml'
- goals: 'clean install -
V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-Djenkins -Dsonar'
+ goals: 'clean install -
Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -V -B
-Djenkins -Dsonar'
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- settings: '{integration-distribution-settings}'
- global-settings: '{odl-global-settings}'
+ settings: 'integration-distribution-settings'
+ settings-type: cfp
+ global-settings: 'odl-global-settings'
+ global-settings-type: cfp
reporters:
- findbugs
reporters:
- findbugs
@@
-98,6
+96,8
@@
- email-notification:
email-prefix: '[distribution]'
- jacoco-report
- email-notification:
email-prefix: '[distribution]'
- jacoco-report
+ - archive-build:
+ maven-version: '{mvn33}'
- job-template:
name: 'distribution-clm-{stream}'
- job-template:
name: 'distribution-clm-{stream}'
@@
-119,32
+119,30
@@
scm:
- git-scm:
scm:
- git-scm:
- credentials-id: '{ssh-credentials}'
refspec: ''
branch: '{branch}'
wrappers:
refspec: ''
branch: '{branch}'
wrappers:
- - build-timeout
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - opendaylight-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- timed: 'H H * * 6'
prebuilders:
triggers:
- timed: 'H H * * 6'
prebuilders:
- - wipe-org-opendaylight-repo
- provide-maven-settings:
- provide-maven-settings:
- global-settings-file: '
{odl-global-settings}
'
- settings-file: '
{integration-distribution-settings}
'
+ global-settings-file: '
odl-global-settings
'
+ settings-file: '
integration-distribution-settings
'
maven:
maven-name: '{mvn33}'
root-pom: 'pom.xml'
maven:
maven-name: '{mvn33}'
root-pom: 'pom.xml'
- goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+ goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -
V -B -
Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
- settings: '{integration-distribution-settings}'
- global-settings: '{odl-global-settings}'
+ settings: 'integration-distribution-settings'
+ settings-type: cfp
+ global-settings: 'odl-global-settings'
+ global-settings-type: cfp
postbuilders:
- shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
postbuilders:
- shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
@@
-154,6
+152,8
@@
publishers:
- email-notification:
email-prefix: '[distribution]'
publishers:
- email-notification:
email-prefix: '[distribution]'
+ - archive-build:
+ maven-version: '{mvn33}'
- job-template:
name: 'distribution-validate-autorelease-{stream}'
- job-template:
name: 'distribution-validate-autorelease-{stream}'
@@
-173,14
+173,14
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
+ - gerrit-parameters:
+ project: '{project}'
branch: '{branch}'
branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
- autorelease-release-tag:
release-tag: 'validate'
- autorelease-release-branch:
release-branch: '{branch}'
- autorelease-release-tag:
release-tag: 'validate'
- autorelease-release-branch:
release-branch: '{branch}'
- - autorelease-release-datestamp:
- datestamp: true
- string:
name: CLONE_URL
default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/autorelease'
- string:
name: CLONE_URL
default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/autorelease'
@@
-189,28
+189,27
@@
scm:
- git:
url: '$CLONE_URL'
scm:
- git:
url: '$CLONE_URL'
+ credentials-id: 'opendaylight-jenkins-ssh'
refspec: ''
branches:
- 'origin/{branch}'
skip-tag: true
submodule:
recursive: true
refspec: ''
branches:
- 'origin/{branch}'
skip-tag: true
submodule:
recursive: true
- timeout:
15
+ timeout:
60
wrappers:
wrappers:
- - autorelease-build-timeout
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - opendaylight-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit:
server-name: 'OpenDaylight'
trigger-on:
- patchset-created-event:
triggers:
- gerrit:
server-name: 'OpenDaylight'
trigger-on:
- patchset-created-event:
- exclude-drafts: '
fals
e'
+ exclude-drafts: '
tru
e'
exclude-trivial-rebase: 'false'
exclude-trivial-rebase: 'false'
- exclude-no-code-change: '
fals
e'
+ exclude-no-code-change: '
tru
e'
- draft-published-event
- comment-added-contains-event:
comment-contains-value: 'recheck'
- draft-published-event
- comment-added-contains-event:
comment-contains-value: 'recheck'
@@
-229,26
+228,29
@@
pattern: '**/*.xml'
prebuilders:
pattern: '**/*.xml'
prebuilders:
- - wipe-org-opendaylight-repo
- jacoco-nojava-workaround
- autorelease-checkout-gerrit-patch
- autorelease-generate-release-patches
- maven-target:
maven-version: '{mvn33}'
pom: validate-pom.xml
- jacoco-nojava-workaround
- autorelease-checkout-gerrit-patch
- autorelease-generate-release-patches
- maven-target:
maven-version: '{mvn33}'
pom: validate-pom.xml
- goals: 'clean install -B -T1.5C -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+ goals: 'clean install -
V -
B -T1.5C -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
java-opts:
- '-Xmx8g'
java-opts:
- '-Xmx8g'
- settings: '{autorelease-settings}'
- global-settings: '{odl-global-settings}'
+ settings: 'autorelease-settings'
+ settings-type: cfp
+ global-settings: 'odl-global-settings'
+ global-settings-type: cfp
maven:
maven-name: '{mvn33}'
root-pom: 'pom.xml'
maven:
maven-name: '{mvn33}'
root-pom: 'pom.xml'
- goals: 'clean validate -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+ goals: 'clean validate -
V -
B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
- settings: '{autorelease-settings}'
- global-settings: '{odl-global-settings}'
+ settings: 'autorelease-settings'
+ settings-type: cfp
+ global-settings: 'odl-global-settings'
+ global-settings-type: cfp
automatic-archiving: false
post-step-run-condition: UNSTABLE
automatic-archiving: false
post-step-run-condition: UNSTABLE
@@
-258,4
+260,6
@@
publishers:
- email-notification:
email-prefix: '[autorelease] [distribution]'
publishers:
- email-notification:
email-prefix: '[autorelease] [distribution]'
+ - archive-build:
+ maven-version: '{mvn33}'