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
Allow mvn-version to be overrided in distro-check
[releng/builder.git]
/
jjb
/
integration
/
distribution
/
distribution-jobs.yaml
diff --git
a/jjb/integration/distribution/distribution-jobs.yaml
b/jjb/integration/distribution/distribution-jobs.yaml
index cb8a4113681e81849d0347e4a56ef6b00f0b9776..3fe467e0475301b16798bba4a5bfe10ef3d5cf81 100644
(file)
--- a/
jjb/integration/distribution/distribution-jobs.yaml
+++ b/
jjb/integration/distribution/distribution-jobs.yaml
@@
-6,7
+6,7
@@
name: 'distribution-verify-{stream}'
project-type: freestyle
name: 'distribution-verify-{stream}'
project-type: freestyle
- node: centos7-
java-builder-2
c-8g
+ node: centos7-
builder-8
c-8g
concurrent: true
jdk: '{jre}'
concurrent: true
jdk: '{jre}'
@@
-20,7
+20,7
@@
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}
**/dependency_tree.txt **/*.hprof
'
+ artifacts: '{archive-artifacts}'
- integration-patch-refspec:
branch: '$GERRIT_REFSPEC'
- integration-patch-refspec:
branch: '$GERRIT_REFSPEC'
@@
-35,7
+35,7
@@
triggers:
- gerrit-trigger-patch-submitted:
triggers:
- gerrit-trigger-patch-submitted:
-
server: '{
server-name}'
+
gerrit-server-name: '{gerrit-
server-name}'
project: '{project}'
branch: '{branch}'
files: '**'
project: '{project}'
branch: '{branch}'
files: '**'
@@
-51,7
+51,9
@@
goals: |
clean install dependency:tree -DoutputFile=dependency_tree.txt
-Dstream={stream}
goals: |
clean install dependency:tree -DoutputFile=dependency_tree.txt
-Dstream={stream}
+ -Dsft.heap.max=4g
{opendaylight-infra-mvn-opts}
{opendaylight-infra-mvn-opts}
+ # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
java-opts:
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: integration-settings
java-opts:
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: integration-settings
@@
-61,7
+63,7
@@
publishers:
- findbugs
publishers:
- findbugs
- - jacoco-report
+ -
lf-
jacoco-report
- lf-infra-publish
- email-notification:
email-recipients: '{email-recipients}'
- lf-infra-publish
- email-notification:
email-recipients: '{email-recipients}'
@@
-76,7
+78,7
@@
# https://issues.apache.org/jira/browse/MNG-5666
project-type: maven
# https://issues.apache.org/jira/browse/MNG-5666
project-type: maven
- node: '
{build-node}
'
+ node: '
centos7-builder-8c-8g
'
jdk: '{jre}'
properties:
jdk: '{jre}'
properties:
@@
-89,7
+91,7
@@
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}
**/dependency_tree.txt **/*.hprof **/target/surefire-reports/*-output.txt
'
+ artifacts: '{archive-artifacts}'
- distribution-karaf-version:
karaf-version: '{karaf-version}'
- distribution-karaf-version:
karaf-version: '{karaf-version}'
@@
-104,7
+106,7
@@
triggers:
- gerrit-trigger-patch-merged:
triggers:
- gerrit-trigger-patch-merged:
-
server-name: '{
server-name}'
+
gerrit-server-name: '{gerrit-
server-name}'
name: 'integration/distribution'
branch: '{branch}'
name: 'integration/distribution'
branch: '{branch}'
@@
-124,6
+126,7
@@
goals: >
clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
goals: >
clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+ -Dsft.heap.max=4g
-Djenkins -Dmerge -Dstream={stream}
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
settings: 'integration-settings'
-Djenkins -Dmerge -Dstream={stream}
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
settings: 'integration-settings'
@@
-177,7
+180,7
@@
id: ''
unique-version: true
deploy-unstable: false
id: ''
unique-version: true
deploy-unstable: false
- - jacoco-report
+ -
lf-
jacoco-report
- lf-infra-publish
- email-notification:
email-recipients: '{email-recipients}'
- lf-infra-publish
- email-notification:
email-recipients: '{email-recipients}'
@@
-185,11
+188,22
@@
- job-template:
name: 'distribution-check-{stream}'
- job-template:
name: 'distribution-check-{stream}'
- # Like a {project}-distribution-check, but one step less as there is no upstream project involved.
+
+ ######################
+ # Default parameters #
+ ######################
+
+ mvn-version: mvn33
+
+ #####################
+ # Job Configuration #
+ #####################
+
+ # Like a {project}-distribution-check, but few steps less as there is no upstream project involved.
disabled: false
project-type: freestyle
disabled: false
project-type: freestyle
- node: '
{build-node}
'
+ node: '
centos7-builder-8c-8g
'
concurrent: true
jdk: '{jdk}'
concurrent: true
jdk: '{jdk}'
@@
-203,7
+217,7
@@
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}
**/dependency_tree.txt **/target/surefire-reports/*-output.txt
'
+ artifacts: '{archive-artifacts}'
- distribution-karaf-version:
karaf-version: '{karaf-version}'
- maven-exec:
- distribution-karaf-version:
karaf-version: '{karaf-version}'
- maven-exec:
@@
-226,7
+240,7
@@
triggers:
- gerrit-trigger-patch-submitted:
triggers:
- gerrit-trigger-patch-submitted:
-
server: '{
server-name}'
+
gerrit-server-name: '{gerrit-
server-name}'
project: '{project}'
branch: '{branch}'
files: '**'
project: '{project}'
branch: '{branch}'
files: '**'
@@
-236,30
+250,29
@@
- distribution-check-build-project:
pom: 'distribution/pom.xml'
mvn-opts: '{opendaylight-infra-mvn-opts}'
- distribution-check-build-project:
pom: 'distribution/pom.xml'
mvn-opts: '{opendaylight-infra-mvn-opts}'
+ mvn-version: '{mvn-version}'
+ # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
- distribution-check-verify-groupid:
gerrit-project: 'integration'
- distribution-check-delete-snapshots
- distribution-check-configure-remotes
- distribution-check-verify-groupid:
gerrit-project: 'integration'
- distribution-check-delete-snapshots
- distribution-check-configure-remotes
- - distribution-check-repeat-build:
-
dist-
pom: 'distribution/pom.xml'
+ - distribution-check-repeat-
project-
build:
+ pom: 'distribution/pom.xml'
mvn-opts: '{opendaylight-infra-mvn-opts}'
mvn-opts: '{opendaylight-infra-mvn-opts}'
+ mvn-version: '{mvn-version}'
+ # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
+ - integration-set-variables
+ - distribution-check-warn-9191
+ - distribution-check-warn-9192
- integration-upload-distribution:
dist-pom: distribution/pom.xml
- integration-upload-distribution:
dist-pom: distribution/pom.xml
- -
integration-distribution-check
+ -
distribution-check-bootup
publishers:
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[{project-name}]'
publishers:
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[{project-name}]'
- - postbuildscript:
- builders:
- - shell: |
- #!/bin/bash
- mkdir -p $WORKSPACE/archives
- cp karaf*.log $WORKSPACE/archives
- script-only-if-succeeded: false
- script-only-if-failed: false
- mark-unstable-if-failed: true
+ - integration-csit-archive-build
- lf-infra-publish
- job-template:
- lf-infra-publish
- job-template:
@@
-269,7
+282,7
@@
# FIXME: List required variables.
project-type: freestyle
# FIXME: List required variables.
project-type: freestyle
- node: centos7-
java-builder-2c-8
g
+ node: centos7-
builder-4c-4
g
concurrent: false
properties:
concurrent: false
properties:
@@
-282,7
+295,7
@@
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}
**/*.hprof
'
+ artifacts: '{archive-artifacts}'
- integration-distribution-branch:
branch: '{branch}'
- integration-bundle-url:
- integration-distribution-branch:
branch: '{branch}'
- integration-bundle-url:
@@
-315,7
+328,7
@@
# FIXME: List required variables.
project-type: freestyle
# FIXME: List required variables.
project-type: freestyle
- node: centos7-
java-builder-2c-8
g
+ node: centos7-
builder-4c-4
g
concurrent: false
properties:
concurrent: false
properties:
@@
-328,7
+341,7
@@
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}
**/*.hprof
'
+ artifacts: '{archive-artifacts}'
- integration-distribution-branch:
branch: '{branch}'
- integration-bundle-url:
- integration-distribution-branch:
branch: '{branch}'
- integration-bundle-url: