X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=d3b8cab99d90521beac2bc4fd0fda0429e8e81ef;hb=HEAD;hp=16d28d194168296a39eeb3ed9d9e8c86a97cd072;hpb=02e3aab1892cc1b68d99cfad86ec32b645aa74c8;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 16d28d1941..097942c88b 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -8,42 +8,43 @@ - "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" - java-version: "openjdk17" # CSIT Lists in defaults.yaml stream: - - chlorine: + - titanium: branch: "master" - csit-list: !include: csit-jobs-chlorine.lst + csit-list: !include: csit-jobs-titanium.lst build-order: > odlparent infrautils yangtools mdsal controller aaa netconf bgpcep serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping integration/distribution - - - sulfur: - branch: "stable/sulfur" - java-version: "openjdk11" - csit-list: !include: csit-jobs-sulfur.lst + - scandium: + branch: "stable/scandium" + csit-list: !include: csit-jobs-scandium.lst build-order: > odlparent infrautils yangtools mdsal controller aaa netconf bgpcep serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping integration/distribution - - - phosphorus: - branch: "stable/phosphorus" - mvn-version: "mvn35" - java-version: "openjdk11" - csit-list: !include: csit-jobs-phosphorus.lst + - calcium: + branch: "stable/calcium" + csit-list: !include: csit-jobs-calcium.lst + build-order: > + 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 aaa netconf bgpcep serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping @@ -61,45 +62,58 @@ # CSIT Lists in defaults.yaml stream: - - chlorine: + - titanium: branch: "master" csit-blocklist: > - aaa controller dluxapps genius lispflowmapping l2switch mdsal + 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-chlorine.lst - csit-mri-list: "{csit-mri-list-chlorine}" - csit-weekly-list: "{csit-weekly-list-chlorine}" - - sulfur: - branch: "stable/sulfur" + csit-list: !include: csit-jobs-titanium.lst + csit-mri-list: "{csit-mri-list-titanium}" + csit-weekly-list: "{csit-weekly-list-titanium}" + - scandium: + branch: "stable/scandium" csit-blocklist: > - aaa controller dluxapps genius lispflowmapping l2switch mdsal + 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 controller dluxapps genius lispflowmapping l2switch mdsal + 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}" + 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 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-potassium.lst + csit-mri-list: "{csit-mri-list-potassium}" + csit-weekly-list: "{csit-weekly-list-potassium}" - project: name: integration-sanity @@ -109,18 +123,22 @@ - "integration-sanity-test-{stream}" stream: - - chlorine: + - titanium: branch: "master" - karaf-version: odl - csit-sanity-list: "{csit-sanity-list-chlorine}" - - sulfur: - branch: "stable/sulfur" - karaf-version: odl - csit-sanity-list: "{csit-sanity-list-sulfur}" - - phosphorus: - branch: "stable/phosphorus" - karaf-version: odl - csit-sanity-list: "{csit-sanity-list-phosphorus}" + karaf-version: karaf4 + csit-sanity-list: "{csit-sanity-list-titanium}" + - scandium: + branch: "stable/scandium" + karaf-version: karaf4 + csit-sanity-list: "{csit-sanity-list-scandium}" + - calcium: + branch: "stable/calcium" + karaf-version: karaf4 + csit-sanity-list: "{csit-sanity-list-calcium}" + - potassium: + branch: "stable/potassium" + karaf-version: karaf4 + csit-sanity-list: "{csit-sanity-list-potassium}" - job-template: name: "integration-merge-dashboard" @@ -190,6 +208,8 @@ bundle-url: "{bundle-url}" - distribution-karaf-version: karaf-version: "{karaf-version}" + - integration-distribution-branch: + branch: "{branch}" builders: - lf-infra-pre-build @@ -199,6 +219,7 @@ predefined-parameters: | BUNDLE_URL=$BUNDLE_URL KARAF_VERSION=$KARAF_VERSION + DISTROBRANCH=$DISTROBRANCH wrappers: - lf-infra-wrappers: @@ -230,6 +251,8 @@ bundle-url: "{bundle-url}" - distribution-karaf-version: karaf-version: "{karaf-version}" + - integration-distribution-branch: + branch: "{branch}" triggers: - timed: "{schedule-daily}" @@ -242,6 +265,7 @@ predefined-parameters: | BUNDLE_URL=$BUNDLE_URL KARAF_VERSION=$KARAF_VERSION + DISTROBRANCH=$DISTROBRANCH publishers: - email-notification: @@ -354,6 +378,7 @@ predefined-parameters: | BUNDLE_URL=$BUNDLE_URL KARAF_VERSION=$KARAF_VERSION + DISTROBRANCH=$DISTROBRANCH publishers: - lf-infra-publish @@ -460,6 +485,7 @@ predefined-parameters: | BUNDLE_URL=$BUNDLE_URL KARAF_VERSION=$KARAF_VERSION + DISTROBRANCH=$DISTROBRANCH publishers: - lf-infra-publish @@ -482,6 +508,8 @@ bundle-url: "{bundle-url}" - distribution-karaf-version: karaf-version: "{karaf-version}" + - integration-distribution-branch: + branch: "{branch}" triggers: - timed: "{schedule-weekly}" @@ -493,6 +521,7 @@ predefined-parameters: | BUNDLE_URL=$BUNDLE_URL KARAF_VERSION=$KARAF_VERSION + DISTROBRANCH=$DISTROBRANCH publishers: - email-notification: @@ -515,6 +544,8 @@ bundle-url: "{bundle-url}" - distribution-karaf-version: karaf-version: "{karaf-version}" + - integration-distribution-branch: + branch: "{branch}" triggers: - timed: "{schedule-weekly}" @@ -526,6 +557,7 @@ predefined-parameters: | BUNDLE_URL=$BUNDLE_URL KARAF_VERSION=$KARAF_VERSION + DISTROBRANCH=$DISTROBRANCH publishers: - email-notification: @@ -547,6 +579,8 @@ bundle-url: "{bundle-url}" - distribution-karaf-version: karaf-version: "{karaf-version}" + - integration-distribution-branch: + branch: "{branch}" triggers: - timed: "{schedule-weekly}" @@ -558,6 +592,7 @@ predefined-parameters: | BUNDLE_URL=$BUNDLE_URL KARAF_VERSION=$KARAF_VERSION + DISTROBRANCH=$DISTROBRANCH publishers: - email-notification: