X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=1bebf9bef8cc3beabcbafe01726b137f3d18bdc8;hb=30335204e5bcf1f465fd890b5fc330539c7089fd;hp=f4461f6a8aceca6927f6741550d7f035a6b7943d;hpb=3ff072511ecacd6a002ef166b097d7386a861afe;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index f4461f6a8..1bebf9bef 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -19,45 +19,35 @@ # CSIT Lists in defaults.yaml stream: - - phosphorus: + - chlorine: branch: "master" - mvn-version: "mvn35" - java-version: "openjdk11" - csit-list: !include: csit-jobs-phosphorus.lst - build-order: > - odlparent infrautils yangtools mdsal controller serviceutils aaa netconf - daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping - bgpcep integration/distribution - - - silicon: - branch: "stable/silicon" - mvn-version: "mvn35" + mvn-version: "mvn38" java-version: "openjdk11" - csit-list: !include: csit-jobs-silicon.lst + csit-list: !include: csit-jobs-chlorine.lst build-order: > - odlparent infrautils yangtools mdsal controller serviceutils aaa netconf - daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping - bgpcep integration/distribution + odlparent infrautils yangtools mdsal controller aaa netconf bgpcep + serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping + integration/distribution - - aluminium: - branch: "stable/aluminium" - mvn-version: "mvn35" + - sulfur: + branch: "stable/sulfur" + mvn-version: "mvn38" java-version: "openjdk11" - csit-list: !include: csit-jobs-aluminium.lst + csit-list: !include: csit-jobs-sulfur.lst build-order: > - odlparent infrautils yangtools mdsal controller serviceutils aaa netconf - daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt - bgpcep integration/distribution + odlparent infrautils yangtools mdsal controller aaa netconf bgpcep + serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping + integration/distribution - - magnesium: - branch: "stable/magnesium" + - phosphorus: + branch: "stable/phosphorus" mvn-version: "mvn35" java-version: "openjdk11" - csit-list: !include: csit-jobs-magnesium.lst + csit-list: !include: csit-jobs-phosphorus.lst build-order: > - odlparent infrautils yangtools mdsal controller serviceutils aaa netconf - daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt - bgpcep integration/distribution + odlparent infrautils yangtools mdsal controller aaa netconf bgpcep + serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping + integration/distribution - project: name: integration-distribution @@ -71,64 +61,45 @@ # CSIT Lists in defaults.yaml stream: - - phosphorus: + - chlorine: branch: "master" csit-blocklist: > - bier controller dluxapps genius lispflowmapping l2switch mdsal nemo - netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools + aaa controller dluxapps genius lispflowmapping l2switch mdsal + netconf netvirt odlmicro sxp yangtools gate longevity sanity tdd tempest wip bgpcep-csit-3node-bgpclustering-all bgpcep-csit-3node-bgpclustering-ha-only openflowplugin-csit-1node-bundle-based-reconciliation last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used - csit-list: !include: csit-jobs-phosphorus.lst - csit-mri-list: "{csit-mri-list-phosphorus}" - csit-weekly-list: "{csit-weekly-list-phosphorus}" - - silicon: - branch: "stable/silicon" + csit-list: !include: csit-jobs-chlorine.lst + csit-mri-list: "{csit-mri-list-chlorine}" + csit-weekly-list: "{csit-weekly-list-chlorine}" + - sulfur: + branch: "stable/sulfur" csit-blocklist: > - bier controller dluxapps genius lispflowmapping l2switch mdsal nemo - netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools + aaa controller dluxapps genius lispflowmapping l2switch mdsal + netconf netvirt odlmicro sxp yangtools gate longevity sanity tdd tempest wip bgpcep-csit-3node-bgpclustering-all bgpcep-csit-3node-bgpclustering-ha-only openflowplugin-csit-1node-bundle-based-reconciliation last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used - csit-list: !include: csit-jobs-silicon.lst - csit-mri-list: "{csit-mri-list-silicon}" - csit-weekly-list: "{csit-weekly-list-silicon}" - - aluminium: - branch: "stable/aluminium" - csit-blocklist: > - bier controller dluxapps lispflowmapping l2switch mdsal nemo - odlmicro packetcable sfc sxp telemetry tsdr usc yangtools - gate longevity sanity tdd tempest wip - bgpcep-csit-3node-bgpclustering-all - bgpcep-csit-3node-bgpclustering-ha-only - netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike - netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct - netvirt-csit-3node-1cmb - openflowplugin-csit-1node-bundle-based-reconciliation - last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used - csit-list: !include: csit-jobs-aluminium.lst - csit-mri-list: "{csit-mri-list-aluminium}" - csit-weekly-list: "{csit-weekly-list-aluminium}" - - magnesium: - branch: "stable/magnesium" + csit-list: !include: csit-jobs-sulfur.lst + csit-mri-list: "{csit-mri-list-sulfur}" + csit-weekly-list: "{csit-weekly-list-sulfur}" + - phosphorus: + branch: "stable/phosphorus" csit-blocklist: > - alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo - p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools + aaa controller dluxapps genius lispflowmapping l2switch mdsal + netconf netvirt odlmicro sxp yangtools gate longevity sanity tdd tempest wip bgpcep-csit-3node-bgpclustering-all bgpcep-csit-3node-bgpclustering-ha-only - netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike - netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct - netvirt-csit-3node-1cmb openflowplugin-csit-1node-bundle-based-reconciliation last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used - csit-list: !include: csit-jobs-magnesium.lst - csit-mri-list: "{csit-mri-list-magnesium}" - csit-weekly-list: "{csit-weekly-list-magnesium}" + csit-list: !include: csit-jobs-phosphorus.lst + csit-mri-list: "{csit-mri-list-phosphorus}" + csit-weekly-list: "{csit-weekly-list-phosphorus}" - project: name: integration-sanity @@ -138,22 +109,18 @@ - "integration-sanity-test-{stream}" stream: - - phosphorus: + - chlorine: branch: "master" karaf-version: odl - csit-sanity-list: "{csit-sanity-list-phosphorus}" - - silicon: - branch: "stable/silicon" - karaf-version: odl - csit-sanity-list: "{csit-sanity-list-silicon}" - - aluminium: - branch: "stable/aluminium" + csit-sanity-list: "{csit-sanity-list-chlorine}" + - sulfur: + branch: "stable/sulfur" karaf-version: odl - csit-sanity-list: "{csit-sanity-list-aluminium}" - - magnesium: - branch: "stable/magnesium" + csit-sanity-list: "{csit-sanity-list-sulfur}" + - phosphorus: + branch: "stable/phosphorus" karaf-version: odl - csit-sanity-list: "{csit-sanity-list-magnesium}" + csit-sanity-list: "{csit-sanity-list-phosphorus}" - job-template: name: "integration-merge-dashboard" @@ -309,7 +276,7 @@ - integration-distribution-git-url: git-url: "{git-url}" - maven-exec: - maven-version: mvn35 + maven-version: "{mvn-version}" scm: - integration-gerrit-scm: @@ -351,7 +318,7 @@ - lf-update-java-alternatives: java-version: "{java-version}" - maven-target: - maven-version: "mvn35" + maven-version: "{mvn-version}" pom: "$GERRIT_PROJECT/pom.xml" goals: | clean install dependency:tree -DoutputFile=dependency_tree.txt @@ -366,7 +333,7 @@ global-settings: global-settings global-settings-type: cfp - maven-target: - maven-version: mvn35 + maven-version: "{mvn-version}" pom: distribution/pom.xml goals: | clean install dependency:tree -DoutputFile=dependency_tree.txt @@ -380,6 +347,7 @@ global-settings-type: cfp - integration-upload-distribution: dist-pom: distribution/pom.xml + settings-project: integration - trigger-builds: - project: "{csit-list}" block: true @@ -447,7 +415,7 @@ - lf-infra-maven-parameters: mvn-opts: "" mvn-params: "" - mvn-version: mvn35 + mvn-version: "{mvn-version}" staging-profile-id: "" # Staging repos do not make sense for this job wrappers: @@ -480,6 +448,7 @@ - integration-multipatch-builder - integration-upload-distribution: dist-pom: patch_tester/distribution/pom.xml + settings-project: integration - conditional-step: condition-kind: boolean-expression condition-expression: $RUN_TEST @@ -530,6 +499,39 @@ email-recipients: "{email-recipients}" email-prefix: "[integration]" +- job-template: + name: "{project}-distribution-mri-test-{stream}" + id: inttest-distribution-mri-test + + project-type: freestyle + node: queue-intque-2c-1g + + properties: + - opendaylight-infra-properties: + build-days-to-keep: "{build-days-to-keep}" + + parameters: + - integration-bundle-url: + bundle-url: "{bundle-url}" + - distribution-karaf-version: + karaf-version: "{karaf-version}" + + triggers: + - timed: "{schedule-weekly}" + + builders: + - trigger-builds: + - project: "{csit-mri-list}" + block: true + predefined-parameters: | + BUNDLE_URL=$BUNDLE_URL + KARAF_VERSION=$KARAF_VERSION + + publishers: + - email-notification: + email-recipients: "{email-recipients}" + email-prefix: "[integration]" + - job-template: name: "integration-distribution-weekly-test-trigger-{stream}" @@ -633,7 +635,7 @@ gerrit-host: "git.opendaylight.org" gerrit-topic: "auto-update-csit-jobs-{stream}" gerrit-commit-message: "Auto Update CSIT Jobs to run for {stream}" - reviewers-email: "" + reviewers-email: "jenkins-releng@opendaylight.org" publishers: - lf-infra-publish