Consolidate py2 and py3 requirements files

[releng/builder.git] / jjb / integration / integration-test-jobs.yaml

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 037f11cd83b363e4781279f882885105779e722f..76550aa83fdad803f3eb5c5db1ded7436ee23f6a 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -15,6 +15,7 @@
       - gerrit-tox-verify:
           branch: master
           stream: master
       - gerrit-tox-verify:
           branch: master
           stream: master

+          build-node: centos7-builder-2c-2g

 
     # CSIT Lists in defaults.yaml
     stream:
 
     # CSIT Lists in defaults.yaml
     stream:


@@ -24,7 +25,7 @@
           java-version: 'openjdk11'
           csit-list: !include: csit-jobs-aluminium.lst
           build-order: >
           java-version: 'openjdk11'
           csit-list: !include: csit-jobs-aluminium.lst
           build-order: >

-              odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
+              odlparent yangtools mdsal controller infrautils serviceutils aaa netconf

               daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
               bgpcep integration/distribution
 
               daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
               bgpcep integration/distribution
 


@@ -62,12 +63,15 @@
       - aluminium:
           branch: 'master'
           csit-blacklist: >
       - aluminium:
           branch: 'master'
           csit-blacklist: >

-              alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
-              p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
+              alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
+              nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools

               gate longevity sanity tdd tempest wip
               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
               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}'
               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}'


@@ -78,9 +82,12 @@
               alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
               p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
               alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
               p4plugin packetcable sfc sxp telemetry tsdr unimgr 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
               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}'
               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}'


@@ -91,9 +98,12 @@
               alto bier dluxapps groupbasedpolicy jsonrpc l2switch mdsal nemo
               p4plugin packetcable sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
               alto bier dluxapps groupbasedpolicy jsonrpc l2switch mdsal nemo
               p4plugin packetcable sxp telemetry tsdr unimgr 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
               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-sodium.lst
           csit-mri-list: '{csit-mri-list-sodium}'
               last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
           csit-list: !include: csit-jobs-sodium.lst
           csit-mri-list: '{csit-mri-list-sodium}'


@@ -604,6 +614,15 @@
     publishers:
       - lf-infra-publish
 
     publishers:
       - lf-infra-publish
 

+- project:
+    name: integration-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: integration
+    project-name: integration
+    branch: master
+    build-node: centos7-builder-2c-1g
+

 - project:
     name: integration-view
     views:
 - project:
     name: integration-view
     views: