Add missing sodium jobs

Change-Id: I17be036c609ab65aafad71f206663aabfbf426ca
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index cc01016fb6b772b1f98fe039ff52439d7da044ba..d08be1a915f2a50c94258a060f286f37af500ad4 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -179,12 +179,17 @@
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-high-frequency-list-sodium: >
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium
     csit-high-frequency-list-neon: >
         netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon
     csit-high-frequency-list-fluorine: >
         netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine
     csit-high-frequency-list-oxygen: >
         netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen
+    csit-sanity-list-sodium: >
+        openflowplugin-csit-1node-sanity-only-sodium,
+        distribution-sanity-sodium
     csit-sanity-list-neon: >
         openflowplugin-csit-1node-sanity-only-neon,
         distribution-sanity-neon
@@ -194,6 +199,15 @@
     csit-sanity-list-oxygen: >
         openflowplugin-csit-1node-sanity-only-oxygen,
         distribution-sanity-oxygen
+    csit-weekly-list-sodium: >
+        controller-csit-1node-notifications-longevity-only-sodium,
+        controller-csit-3node-drb-partnheal-longevity-only-sodium,
+        controller-csit-3node-drb-precedence-longevity-only-sodium,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-sodium,
+        bgpcep-csit-3node-bgpclustering-longevity-only-sodium,
+        distribution-deploy-sodium,
+        distribution-offline-sodium,
+        openflowplugin-csit-1node-longevity-only-sodium
     csit-weekly-list-neon: >
         controller-csit-1node-notifications-longevity-only-neon,
         controller-csit-3node-drb-partnheal-longevity-only-neon,

diff --git a/jjb/integration/csit-jobs-sodium.lst b/jjb/integration/csit-jobs-sodium.lst
new file mode 100644 (file)
index 0000000..9d95f6b
--- /dev/null
+++ b/jjb/integration/csit-jobs-sodium.lst
@@ -0,0 +1,64 @@
+aaa-csit-1node-authn-all-neon,
+aaa-csit-1node-tls-only-neon,
+bgpcep-csit-1node-bgp-ingest-all-neon,
+bgpcep-csit-1node-bgp-ingest-mixed-all-neon,
+bgpcep-csit-1node-throughpcep-all-neon,
+bgpcep-csit-1node-userfeatures-all-neon,
+bgpcep-csit-3node-bgpclustering-all-neon,
+bgpcep-csit-3node-bgpclustering-ha-only-neon,
+coe-csit-1node-container-networking-only-neon,
+controller-csit-1node-akka1-all-neon,
+controller-csit-1node-benchmark-all-neon,
+controller-csit-1node-rest-cars-perf-all-neon,
+controller-csit-3node-benchmark-all-neon,
+controller-csit-3node-clustering-ask-all-neon,
+controller-csit-3node-clustering-tell-all-neon,
+controller-csit-3node-rest-clust-cars-perf-ask-only-neon,
+controller-csit-3node-rest-clust-cars-perf-tell-only-neon,
+daexim-csit-1node-basic-only-neon,
+daexim-csit-3node-clustering-basic-only-neon,
+distribution-csit-1node-userfeatures-all-neon,
+distribution-csit-managed-neon,
+genius-csit-1node-upstream-only-neon,
+genius-csit-3node-upstream-only-neon,
+lispflowmapping-csit-1node-msmr-all-neon,
+lispflowmapping-csit-1node-performance-only-neon,
+lispflowmapping-csit-3node-msmr-all-neon,
+mdsal-csit-1node-bindingv1-only-neon,
+netconf-csit-1node-callhome-only-neon,
+netconf-csit-1node-scale-only-neon,
+netconf-csit-1node-userfeatures-all-neon,
+netconf-csit-3node-clustering-only-neon,
+netconf-csit-3node-clustering-scale-only-neon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-neon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-neon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-neon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-neon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-neon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-neon,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-neon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-neon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon,
+netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon,
+netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon,
+odltools-csit-1node-upstream-all-neon,
+openflowplugin-csit-1node-bundle-based-reconciliation-all-neon,
+openflowplugin-csit-1node-cbench-only-neon,
+openflowplugin-csit-1node-flow-services-all-neon,
+openflowplugin-csit-1node-perf-bulkomatic-only-neon,
+openflowplugin-csit-1node-perf-stats-collection-only-neon,
+openflowplugin-csit-1node-scale-link-only-neon,
+openflowplugin-csit-1node-scale-only-neon,
+openflowplugin-csit-1node-scale-switch-only-neon,
+openflowplugin-csit-3node-clustering-bulkomatic-only-neon,
+openflowplugin-csit-3node-clustering-only-neon,
+openflowplugin-csit-3node-clustering-perf-bulkomatic-only-neon,
+ovsdb-csit-1node-upstream-southbound-all-neon,
+ovsdb-csit-3node-upstream-clustering-only-neon,
+sfc-csit-3node-docker-full-deploy-all-neon,
+sfc-csit-3node-rest-basic-all-neon,
+telemetry-csit-1node-basic-all-neon,
+yangtools-csit-1node-system-only-neon,

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index da4941acfee6f0694fd7e606df8ea61c87c53dcf..be7e06e5d9cfa93f0418ac3591288f839773eaa1 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -21,7 +21,7 @@
       - sodium:
           branch: 'master'
           mvn-version: 'mvn35'
-          csit-list: !include: csit-jobs-neon.lst
+          csit-list: !include: csit-jobs-sodium.lst
           build-order: >
               odlparent yangtools infrautils mdsal controller serviceutils aaa netconf
               daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
@@ -67,8 +67,22 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+          csit-blacklist: >
+              alto bier capwap centinel didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
+              l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
+              sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd tempest wip
+              aaa-csit-1node-keystone-all
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
+              netvirt-csit-3node-1cmb
+              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-weekly-list: '{csit-weekly-list-sodium}'
+          csit-high-frequency-list: '{csit-high-frequency-list-sodium}'
+      - neon:
+          branch: 'stable/neon'
           csit-blacklist: >
               alto bier capwap centinel didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
               l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
@@ -117,9 +131,13 @@
       - 'integration-sanity-test-{stream}'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           karaf-version: odl
+          csit-sanity-list: '{csit-sanity-list-sodium}'
+      - neon:
+          branch: 'stable/neon'
+          karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-neon}'
       - fluorine:
           branch: 'stable/fluorine'