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 autoupdate script from jjb verify job"
[releng/builder.git]
/
jjb
/
integration
/
integration-test-jobs.yaml
diff --git
a/jjb/integration/integration-test-jobs.yaml
b/jjb/integration/integration-test-jobs.yaml
index f744433a6d622242b426cf35094b09a90ef139cb..327257c3f42a3f426946632cc738d505d74fbc4e 100644
(file)
--- a/
jjb/integration/integration-test-jobs.yaml
+++ b/
jjb/integration/integration-test-jobs.yaml
@@
-1,13
+1,14
@@
- project:
name: integration-test
jobs:
- project:
name: integration-test
jobs:
- - '{name}-verify-python-{stream}'
+ - '{
project-
name}-verify-python-{stream}'
- 'integration-csit-verify-1node-library'
- 'integration-distribution-test-{stream}'
- 'integration-patch-test-{stream}'
- 'integration-multipatch-test-{stream}'
project: integration/test
- 'integration-csit-verify-1node-library'
- 'integration-distribution-test-{stream}'
- 'integration-patch-test-{stream}'
- 'integration-multipatch-test-{stream}'
project: integration/test
+ project-name: integration-test
stream:
- boron:
stream:
- boron:
@@
-28,6
+29,10
@@
netvirt-csit-1node-openstack-basic-only-{stream},
netvirt-csit-1node-openstack-basic-all-{stream},
netvirt-csit-3node-clustering-only-{stream},
netvirt-csit-1node-openstack-basic-only-{stream},
netvirt-csit-1node-openstack-basic-all-{stream},
netvirt-csit-3node-clustering-only-{stream},
+ ocpplugin-csit-1node-get-only-{stream},
+ ocpplugin-csit-1node-get-all-{stream},
+ ocpplugin-csit-1node-scalability-only-{stream},
+ ocpplugin-csit-1node-scalability-all-{stream},
openflowplugin-csit-1node-flow-services-only-{stream},
openflowplugin-csit-1node-flow-services-helium-redesign-only-{stream},
openflowplugin-csit-1node-flow-services-all-{stream},
openflowplugin-csit-1node-flow-services-only-{stream},
openflowplugin-csit-1node-flow-services-helium-redesign-only-{stream},
openflowplugin-csit-1node-flow-services-all-{stream},
@@
-55,6
+60,7
@@
usc-csit-1node-tcp-only-{stream},
usc-csit-1node-tcp-all-{stream},
vtn-csit-1node-manager-only-{stream},
usc-csit-1node-tcp-only-{stream},
usc-csit-1node-tcp-all-{stream},
vtn-csit-1node-manager-only-{stream},
+ vtn-csit-1node-manager-all-{stream},
vtn-csit-1node-coordinator-only-{stream}
- beryllium:
vtn-csit-1node-coordinator-only-{stream}
- beryllium:
@@
-170,7
+176,7
@@
name: 'integration-csit-verify-1node-library'
project-type: freestyle
name: 'integration-csit-verify-1node-library'
project-type: freestyle
- node:
dynamic_robot
+ node:
centos7-robot-2c-2g
logrotate:
daysToKeep: '{build-days-to-keep}'
logrotate:
daysToKeep: '{build-days-to-keep}'
@@
-179,8
+185,11
@@
artifactNumToKeep: '{build-artifact-num-to-keep}'
parameters:
artifactNumToKeep: '{build-artifact-num-to-keep}'
parameters:
- -
project-parameter
:
+ -
opendaylight-infra-parameters
:
project: 'integration/test'
project: 'integration/test'
+ branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts}'
- integration-branch:
branch: 'stable/beryllium'
- integration-distribution-stream:
- integration-branch:
branch: 'stable/beryllium'
- integration-distribution-stream:
@@
-210,21
+219,18
@@
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
- credentials-id: '{ssh-credentials}'
basedir: 'test'
refspec: '$PATCHREFSPEC'
branch: 'master'
wrappers:
basedir: 'test'
refspec: '$PATCHREFSPEC'
branch: 'master'
wrappers:
- - build-timeout
+ - opendaylight-infra-wrappers:
+ build-timeout: '{build-timeout}'
- integration-openstack-controller-mininet:
controller-image: '{controller-image}'
controller-vms: 1
mininet-image: '{mininet-image}'
mininet-vms: '{mininet-vms}'
- integration-openstack-controller-mininet:
controller-image: '{controller-image}'
controller-vms: 1
mininet-image: '{mininet-image}'
mininet-vms: '{mininet-vms}'
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
triggers:
- integration-trigger-patch-submitted:
triggers:
- integration-trigger-patch-submitted:
@@
-233,6
+239,7
@@
pattern: 'csit/libraries/*'
builders:
pattern: 'csit/libraries/*'
builders:
+ - integration-copy-ssh-keys
- integration-cleanup-workspace
- integration-install-robotframework
- inject:
- integration-cleanup-workspace
- integration-install-robotframework
- inject:
@@
-264,7
+271,7
@@
name: 'integration-distribution-test-{stream}'
project-type: freestyle
name: 'integration-distribution-test-{stream}'
project-type: freestyle
- node:
dynamic_verify
+ node:
centos7-java-builder-2c-8g
logrotate:
daysToKeep: '{build-days-to-keep}'
logrotate:
daysToKeep: '{build-days-to-keep}'
@@
-301,7
+308,7
@@
name: 'integration-patch-test-{stream}'
project-type: maven
name: 'integration-patch-test-{stream}'
project-type: maven
- node:
dynamic_verify
+ node:
centos7-java-builder-2c-8g
jdk: '{jdk}'
logrotate:
jdk: '{jdk}'
logrotate:
@@
-311,31
+318,26
@@
artifactNumToKeep: '{build-artifact-num-to-keep}'
parameters:
artifactNumToKeep: '{build-artifact-num-to-keep}'
parameters:
- -
gerrit
-parameters:
+ -
opendaylight-infra
-parameters:
project: '$GERRIT_PROJECT'
branch: '{branch}'
refspec: '$GERRIT_REFSPEC'
project: '$GERRIT_PROJECT'
branch: '{branch}'
refspec: '$GERRIT_REFSPEC'
- - project-parameter:
- project: '$GERRIT_PROJECT'
+ artifacts: '{archive-artifacts} **/dependency_tree.txt'
- integration-branch:
branch: '{branch}'
- integration-distribution-git-url
scm:
- integration-gerrit-scm:
- integration-branch:
branch: '{branch}'
- integration-distribution-git-url
scm:
- integration-gerrit-scm:
- credentials-id: '{ssh-credentials}'
basedir: '$GERRIT_PROJECT'
refspec: '$GERRIT_REFSPEC'
branch: '{branch}'
- integration-distribution-scm:
basedir: '$GERRIT_PROJECT'
refspec: '$GERRIT_REFSPEC'
branch: '{branch}'
- integration-distribution-scm:
- credentials-id: '{ssh-credentials}'
branch: '{branch}'
wrappers:
branch: '{branch}'
wrappers:
- - build-timeout
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - opendaylight-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit:
triggers:
- gerrit:
@@
-367,7
+369,7
@@
- maven-target:
maven-version: '{mvn33}'
pom: '$GERRIT_PROJECT/pom.xml'
- maven-target:
maven-version: '{mvn33}'
pom: '$GERRIT_PROJECT/pom.xml'
- goals: 'clean install
-V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false
-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+ goals: 'clean install
dependency:tree -DoutputFile=dependency_tree.txt -V -B -Pq -Djenkins
-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
java-opts:
- '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
settings: 'integration-settings'
java-opts:
- '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
settings: 'integration-settings'
@@
-378,7
+380,7
@@
maven:
maven-name: '{mvn33}'
root-pom: 'distribution/pom.xml'
maven:
maven-name: '{mvn33}'
root-pom: 'distribution/pom.xml'
- goals: 'clean install -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+ goals: 'clean install
dependency:tree -DoutputFile=dependency_tree.txt
-V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
settings: 'integration-settings'
settings-type: cfp
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
settings: 'integration-settings'
settings-type: cfp
@@
-395,6
+397,8
@@
BUNDLEURL=$BUNDLEURL
publishers:
BUNDLEURL=$BUNDLEURL
publishers:
+ - archive-build:
+ maven-version: '{mvn33}'
- email-notification:
email-prefix: '[$GERRIT_PROJECT]'
- email-notification:
email-prefix: '[$GERRIT_PROJECT]'
@@
-408,7
+412,7
@@
name: 'integration-multipatch-test-{stream}'
project-type: maven
name: 'integration-multipatch-test-{stream}'
project-type: maven
- node:
dynamic_verify
+ node:
centos7-java-builder-8c-8g
jdk: '{jdk}'
logrotate:
jdk: '{jdk}'
logrotate:
@@
-422,12
+426,11
@@
patches_to_build: '$PATCHES_TO_BUILD'
- integration-branch:
branch: '{branch}'
patches_to_build: '$PATCHES_TO_BUILD'
- integration-branch:
branch: '{branch}'
-
- wrappers:
- - build-timeout
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - opendaylight-infra-parameters:
+ project: 'integration/distribution'
+ branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts} **/dependency_tree.txt'
prebuilders:
- wipe-org-opendaylight-repo
prebuilders:
- wipe-org-opendaylight-repo
@@
-438,12
+441,16
@@
global-settings-file: 'odl-global-settings'
settings-file: 'yangtools-settings'
global-settings-file: 'odl-global-settings'
settings-file: 'yangtools-settings'
+ wrappers:
+ - opendaylight-infra-wrappers:
+ build-timeout: '1200'
+
maven:
maven-name: '{mvn33}'
root-pom: 'patch_tester/pom.xml'
# TODO: Make Maven options configurable. Currently tests are not skipped, everything else is.
maven:
maven-name: '{mvn33}'
root-pom: 'patch_tester/pom.xml'
# TODO: Make Maven options configurable. Currently tests are not skipped, everything else is.
- goals: 'clean install
-f patch_tester/pom.xml -V -B -Djenkins -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false
-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
- maven-opts: '-Xmx
4096
m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+ goals: 'clean install
dependency:tree -DoutputFile=dependency_tree.txt -f patch_tester/pom.xml -V -B -Pq -Djenkins
-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+ maven-opts: '-Xmx
7168
m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
settings: 'yangtools-settings'
settings-type: cfp
global-settings: 'odl-global-settings'
settings: 'yangtools-settings'
settings-type: cfp
global-settings: 'odl-global-settings'
@@
-458,5
+465,7
@@
BUNDLEURL=$BUNDLEURL
publishers:
BUNDLEURL=$BUNDLEURL
publishers:
+ - archive-build:
+ maven-version: '{mvn33}'
- email-notification:
- email-notification:
- email-prefix: '[int
egration
]'
+ email-prefix: '[int
/dist
]'