X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=195876e682dbe82768d9b56f2b1133b957e5a30c;hb=refs%2Fchanges%2F88%2F33788%2F1;hp=c459c8a0ef9d7005dd8952973c76a9bf9ae78ba2;hpb=7ab4c7c10e5b50f128fc3715b4559a235791a75b;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index c459c8a0e..195876e68 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -9,8 +9,9 @@ - 'integration-multipatch-test-{stream}' stream: - - beryllium: + - boron: branch: 'master' + jdk: 'openjdk7' csit-list: > aaa-csit-1node-authn-only-{stream}, aaa-csit-1node-authn-all-{stream}, @@ -27,8 +28,57 @@ 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}, + openflowplugin-csit-1node-flow-services-lithium-redesign-only-{stream}, + openflowplugin-csit-1node-flow-services-all-{stream}, + openflowplugin-csit-1node-scalability-only-{stream}, + openflowplugin-csit-1node-scalability-lithium-redesign-only-{stream}, + openflowplugin-csit-1node-scalability-all-{stream}, + openflowplugin-csit-1node-cbench-performance-only-{stream}, + openflowplugin-csit-1node-cbench-performance-lithium-redesign-only-{stream}, + openflowplugin-csit-1node-config-performance-only-{stream}, + openflowplugin-csit-1node-config-performance-lithium-redesign-only-{stream}, + ovsdb-csit-1node-netvirt-only-{stream}, + ovsdb-csit-1node-netvirt-all-{stream}, + ovsdb-csit-1node-southbound-only-{stream}, + ovsdb-csit-1node-southbound-all-{stream}, + snmp-csit-1node-basic-only-{stream}, + snmp-csit-1node-basic-all-{stream}, + topoprocessing-csit-1node-topology-operations-all-{stream}, + topoprocessing-csit-1node-topology-operations-only-{stream}, + tsdr-csit-1node-hbase-datastore-only-{stream}, + tsdr-csit-1node-hbase-datastore-all-{stream}, + 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} + + - beryllium: + branch: 'stable/beryllium' + jdk: 'openjdk7' + csit-list: > + aaa-csit-1node-authn-only-{stream}, + aaa-csit-1node-authn-all-{stream}, + bgpcep-csit-1node-userfeatures-only-{stream}, + bgpcep-csit-1node-userfeatures-all-{stream}, + 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}, + l2switch-csit-1node-scalability-only-{stream}, + l2switch-csit-1node-scalability-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}, @@ -49,8 +99,6 @@ snmp-csit-1node-basic-all-{stream}, topoprocessing-csit-1node-topology-operations-all-{stream}, topoprocessing-csit-1node-topology-operations-only-{stream}, - tsdr-csit-1node-h2-datastore-only-{stream}, - tsdr-csit-1node-h2-datastore-all-{stream}, tsdr-csit-1node-hbase-datastore-only-{stream}, tsdr-csit-1node-hbase-datastore-all-{stream}, usc-csit-1node-channel-only-{stream}, @@ -58,10 +106,12 @@ vpnservice-csit-1node-vpnservice-only-{stream}, vpnservice-csit-1node-vpnservice-all-{stream}, vtn-csit-1node-manager-only-{stream}, - vtn-csit-1node-manager-all-{stream} + vtn-csit-1node-manager-all-{stream}, + vtn-csit-1node-coordinator-only-{stream} - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' csit-list: > aaa-csit-1node-authn-only-{stream}, aaa-csit-1node-authn-all-{stream}, @@ -70,9 +120,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}, @@ -102,11 +150,13 @@ 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} + vtn-csit-1node-manager-li-only-{stream}, + vtn-csit-1node-manager-li-all-{stream}, + vtn-csit-1node-coordinator-only-{stream} - stable-helium: branch: 'stable/helium' + jdk: 'openjdk7' csit-list: > aaa-csit-1node-imds-authn-only-{stream}, aaa-csit-1node-imds-authn-all-{stream}, @@ -123,7 +173,7 @@ vtn-csit-1node-imds-manager-only-{stream}, vtn-csit-1node-imds-manager-all-{stream} - jdk: 'openjdk7' + # Template: integration-verify-python # Goal: Verify python scripts correct syntax @@ -200,19 +250,25 @@ - project-parameter: project: 'integration/test' - integration-branch: - branch: 'master' + branch: 'stable/beryllium' - integration-bundleurl: bundleurl: 'last' - 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: @@ -255,7 +311,7 @@ publishers: - integration-robot: unstable-if: 0.0 - pass-if: 0.0 + pass-if: 100.0 - archive: artifacts: 'karaf.log*' - email-notification: @@ -280,6 +336,8 @@ parameters: - integration-bundleurl: bundleurl: 'last' + - integration-jdk-version: + jdkversion: 'openjdk7' triggers: - timed: 'H H * * 6' @@ -320,6 +378,8 @@ refspec: '$GERRIT_REFSPEC' - project-parameter: project: '$GERRIT_PROJECT' + - integration-branch: + branch: '{branch}' - integration-distribution-git-url scm: @@ -357,6 +417,7 @@ notbuilt: true prebuilders: + - integration-rebase-gerrit-patch - integration-get-bundle-url - inject: properties-file: 'bundle.txt' @@ -364,7 +425,7 @@ - maven-target: maven-version: '{mvn33}' pom: '$GERRIT_PROJECT/pom.xml' - goals: 'clean install -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' + 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}' @@ -373,7 +434,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' + 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}' @@ -427,15 +488,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: