X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;fp=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=c29cb0380e03d84645fca110ce6b49ef661dab18;hp=16d28d194168296a39eeb3ed9d9e8c86a97cd072;hb=c66102093626187308b241f79772e4165f43fab6;hpb=e9d5b2c097c3e5aa686e4809dc19a1d9e1248b95 diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 16d28d194..c29cb0380 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -22,14 +22,20 @@ # CSIT Lists in defaults.yaml stream: - - chlorine: + - argon: branch: "master" csit-list: !include: csit-jobs-chlorine.lst build-order: > odlparent infrautils yangtools mdsal controller aaa netconf bgpcep serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping integration/distribution - + - chlorine: + branch: "stable/chlorine" + csit-list: !include: csit-jobs-chlorine.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" @@ -38,7 +44,6 @@ odlparent infrautils yangtools mdsal controller aaa netconf bgpcep serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping integration/distribution - - phosphorus: branch: "stable/phosphorus" mvn-version: "mvn35" @@ -61,8 +66,21 @@ # CSIT Lists in defaults.yaml stream: - - chlorine: + - argon: branch: "master" + csit-blocklist: > + 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-argon.lst + csit-mri-list: "{csit-mri-list-argon}" + csit-weekly-list: "{csit-weekly-list-argon}" + - chlorine: + branch: "stable/chlorine" csit-blocklist: > aaa controller dluxapps genius lispflowmapping l2switch mdsal netconf netvirt odlmicro sxp yangtools @@ -109,9 +127,13 @@ - "integration-sanity-test-{stream}" stream: - - chlorine: + - argon: branch: "master" karaf-version: odl + csit-sanity-list: "{csit-sanity-list-argon}" + - chlorine: + branch: "stable/chlorine" + karaf-version: odl csit-sanity-list: "{csit-sanity-list-chlorine}" - sulfur: branch: "stable/sulfur"