X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=c2048478c2851d8d6ef228cdd0ac93beec98d2da;hb=c1542fedd329e93c1c66b39d055da767eb3ccbdb;hp=913e7f79bece08f701e300d25c176bf5447a6a73;hpb=73dbe915f1f57685c387fc1db5921ae40b8ee0a9;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 913e7f79b..c2048478c 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -27,8 +27,8 @@ l2switch-csit-1node-switch-all-{stream}, l2switch-csit-1node-scalability-only-{stream}, l2switch-csit-1node-scalability-all-{stream}, - lispflowmapping-csit-1node-all-only-{stream}, - lispflowmapping-csit-1node-all-all-{stream}, + lispflowmapping-csit-1node-msmr-only-{stream}, + lispflowmapping-csit-1node-msmr-all-{stream}, nic-csit-1node-basic-all-{stream}, nic-csit-1node-basic-only-{stream}, openflowplugin-csit-1node-flow-services-only-{stream}, @@ -56,9 +56,7 @@ usc-csit-1node-channel-only-{stream}, usc-csit-1node-channel-all-{stream}, vpnservice-csit-1node-vpnservice-only-{stream}, - vpnservice-csit-1node-vpnservice-all-{stream}, - vtn-csit-1node-manager-only-{stream}, - vtn-csit-1node-manager-all-{stream} + vpnservice-csit-1node-vpnservice-all-{stream} - stable-lithium: branch: 'stable/lithium' @@ -70,9 +68,7 @@ capwap-csit-1node-ac-only-{stream}, capwap-csit-1node-ac-all-{stream}, controller-csit-3node-clustering-only-{stream}, - controller-csit-3node-clustering-all-{stream}, integration-csit-3node-basic-only-{stream}, - integration-csit-3node-basic-all-{stream}, integration-distribution-offline-{stream}, l2switch-csit-1node-switch-only-{stream}, l2switch-csit-1node-switch-all-{stream}, @@ -206,13 +202,19 @@ - integration-controller-scope: controller-scope: 'only' - integration-controller-features: - controller-features: 'odl-openflowplugin-flow-services-ui,odl-bgpcep-pcep-all,odl-bgpcep-pcep,odl-netconf-connector-all' + controller-features: > + odl-openflowplugin-flow-services-ui, + odl-bgpcep-pcep, + odl-bgpcep-bgp, + odl-netconf-connector-all - integration-test-options: test-options: '-e adsal' - integration-test-plan: test-plan: 'test-libraries.txt' - integration-patch-refspec: branch: '$GERRIT_REFSPEC' + - integration-jdk-version: + jdkversion: 'openjdk7' scm: - integration-gerrit-scm: @@ -239,6 +241,7 @@ pattern: 'csit/libraries/*' builders: + - integration-cleanup-workspace - integration-install-robotframework - inject: properties-file: 'env.properties' @@ -254,9 +257,9 @@ publishers: - integration-robot: unstable-if: 0.0 - pass-if: 0.0 + pass-if: 100.0 - archive: - artifacts: 'karaf.log' + artifacts: 'karaf.log*' - email-notification: email-prefix: '[integration]' @@ -279,6 +282,8 @@ parameters: - integration-bundleurl: bundleurl: 'last' + - integration-jdk-version: + jdkversion: 'openjdk7' triggers: - timed: 'H H * * 6' @@ -319,6 +324,8 @@ refspec: '$GERRIT_REFSPEC' - project-parameter: project: '$GERRIT_PROJECT' + - integration-branch: + branch: '{branch}' - integration-distribution-git-url scm: @@ -356,17 +363,15 @@ notbuilt: true prebuilders: + - integration-rebase-gerrit-patch - integration-get-bundle-url - inject: properties-file: 'bundle.txt' - wipe-org-opendaylight-repo - - provide-maven-settings: - global-settings-file: '{odl-global-settings}' - settings-file: '{yangtools-settings}' - maven-target: maven-version: '{mvn33}' pom: '$GERRIT_PROJECT/pom.xml' - goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar' + goals: 'clean install -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}' java-opts: - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: '{integration-settings}' @@ -375,7 +380,7 @@ maven: maven-name: '{mvn33}' root-pom: 'distribution/pom.xml' - goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar' + goals: 'clean install -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}' global-settings: '{odl-global-settings}' @@ -391,7 +396,7 @@ publishers: - email-notification: - email-prefix: '[integration]' + email-prefix: '[$GERRIT_PROJECT]' # Template: integration-multipatch-test-{stream} # Goal: Build one or more patches and run all available system test on a distribution containing the change @@ -415,6 +420,8 @@ parameters: - patches-to-build-parameter: patches_to_build: '$PATCHES_TO_BUILD' + - integration-branch: + branch: '{branch}' wrappers: - build-timeout @@ -427,15 +434,19 @@ - integration-multipatch-builder - inject: properties-file: 'bundle.txt' + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{yangtools-settings}' + maven: maven-name: '{mvn33}' root-pom: 'patch_tester/pom.xml' - goals: 'clean install -f patch_tester/pom.xml -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}' + # TODO: Make Maven option configurable. Currently tests are not skipped, everything elase is. + goals: 'clean install -f patch_tester/pom.xml -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: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + settings: '{yangtools-settings}' global-settings: '{odl-global-settings}' - ignore-upstream-changes: true post-step-run-condition: 'SUCCESS' postbuilders: