X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=d3b8cab99d90521beac2bc4fd0fda0429e8e81ef;hb=HEAD;hp=57d1c586eb8c53e5d78d5b03f0e852c41ae543fb;hpb=753ab67a9e464c45f6d83feaa06b5a4fa697293e;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 57d1c586e..3ac00be7f 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -8,46 +8,40 @@ - "inttest-multipatch" - "integration-merge-dashboard" - "{project-name}-rtd-jobs": - build-node: centos7-builder-2c-2g + build-node: centos8-builder-2c-2g project-pattern: integration/test rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-integrationtest/32934/ rtd-token: 70766f97941a74ef80b84749ac4799e5ddeee99a - gerrit-tox-verify: branch: master stream: master - build-node: centos7-builder-2c-2g + build-node: centos8-builder-2c-2g + + mvn-version: "mvn38" # CSIT Lists in defaults.yaml stream: - - sulfur: + - scandium: branch: "master" - mvn-version: "mvn35" - java-version: "openjdk11" - csit-list: !include: csit-jobs-sulfur.lst + csit-list: !include: csit-jobs-scandium.lst build-order: > - odlparent infrautils yangtools mdsal controller serviceutils aaa netconf - daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping - bgpcep integration/distribution - - - phosphorus: - branch: "stable/phosphorus" - mvn-version: "mvn35" - java-version: "openjdk11" - csit-list: !include: csit-jobs-phosphorus.lst + odlparent infrautils yangtools mdsal controller aaa netconf bgpcep + serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping + integration/distribution + - calcium: + branch: "stable/calcium" + csit-list: !include: csit-jobs-calcium.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" - java-version: "openjdk11" - csit-list: !include: csit-jobs-silicon.lst + odlparent infrautils yangtools mdsal controller aaa netconf bgpcep + serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping + integration/distribution + - potassium: + branch: "stable/potassium" + csit-list: !include: csit-jobs-potassium.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 - project: name: integration-distribution @@ -61,45 +55,45 @@ # CSIT Lists in defaults.yaml stream: - - sulfur: + - scandium: branch: "master" csit-blocklist: > - aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo - netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools + aaa controller 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-sulfur.lst - csit-mri-list: "{csit-mri-list-sulfur}" - csit-weekly-list: "{csit-weekly-list-sulfur}" - - phosphorus: - branch: "stable/phosphorus" + csit-list: !include: csit-jobs-scandium.lst + csit-mri-list: "{csit-mri-list-scandium}" + csit-weekly-list: "{csit-weekly-list-scandium}" + - calcium: + branch: "stable/calcium" csit-blocklist: > - aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo - netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools + aaa controller 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-calcium.lst + csit-mri-list: "{csit-mri-list-calcium}" + csit-weekly-list: "{csit-weekly-list-calcium}" + - potassium: + branch: "stable/potassium" csit-blocklist: > - aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo - netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools + aaa controller 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}" + csit-list: !include: csit-jobs-potassium.lst + csit-mri-list: "{csit-mri-list-potassium}" + csit-weekly-list: "{csit-weekly-list-potassium}" - project: name: integration-sanity @@ -109,18 +103,18 @@ - "integration-sanity-test-{stream}" stream: - - sulfur: + - scandium: branch: "master" karaf-version: odl - csit-sanity-list: "{csit-sanity-list-sulfur}" - - phosphorus: - branch: "stable/phosphorus" + csit-sanity-list: "{csit-sanity-list-scandium}" + - calcium: + branch: "stable/calcium" karaf-version: odl - csit-sanity-list: "{csit-sanity-list-phosphorus}" - - silicon: - branch: "stable/silicon" + csit-sanity-list: "{csit-sanity-list-calcium}" + - potassium: + branch: "stable/potassium" karaf-version: odl - csit-sanity-list: "{csit-sanity-list-silicon}" + csit-sanity-list: "{csit-sanity-list-potassium}" - job-template: name: "integration-merge-dashboard" @@ -164,7 +158,7 @@ - file-id: odl-elastic-cloud target: "$HOME/.netrc" - integration-install-robotframework - # yamllint disable-line rule:line-length + # yamllint disable-line rule:line-length - shell: python3 $WORKSPACE/test/csit/scripts/push_dashboard.py a4ff38b99ef2c7626450543021b4c134.us-east-1.aws.found.io:9243 publishers: @@ -276,7 +270,7 @@ - integration-distribution-git-url: git-url: "{git-url}" - maven-exec: - maven-version: mvn35 + maven-version: "{mvn-version}" scm: - integration-gerrit-scm: @@ -318,7 +312,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 @@ -333,7 +327,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 @@ -347,6 +341,7 @@ global-settings-type: cfp - integration-upload-distribution: dist-pom: distribution/pom.xml + settings-project: integration - trigger-builds: - project: "{csit-list}" block: true @@ -414,7 +409,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: @@ -447,6 +442,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