Merge "Correct nitrogen and carbon streams in CSIT"

[releng/builder.git] / jjb / releng-defaults.yaml

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index c006e5082b1d440dd98ca0c47948ae5a30c8aafc..ec0423d5a59e6402db061b0fc8bde4bcd4fbbe7a 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -36,6 +36,8 @@
     public-physical-network: 'physnet1'
     security-group-mode: 'none'
     tenant-network-type: 'vxlan'
+    odl-sfc-driver: 'odl'
+    odl-snat-mode: 'controller'
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''
@@ -216,6 +218,8 @@
         didm-csit-1node-discovery-only-nitrogen,
         distribution-csit-1node-userfeatures-all-nitrogen,
         distribution-csit-1node-userfeatures-only-nitrogen,
+        dluxapps-csit-1node-yangman-all-nitrogen,
+        dluxapps-csit-1node-yangman-only-nitrogen,
         eman-csit-1node-model-all-nitrogen,
         eman-csit-1node-model-only-nitrogen,
         genius-csit-1node-genius-all-nitrogen,
@@ -250,6 +254,7 @@
         natapp-csit-1node-basic-only-nitrogen,
         nemo-csit-1node-engine-all-nitrogen,
         nemo-csit-1node-engine-only-nitrogen,
+        netconf-csit-1node-callhome-only-nitrogen,
         netconf-csit-1node-periodic-scale-all-nitrogen,
         netconf-csit-1node-periodic-scale-only-nitrogen,
         netconf-csit-1node-userfeatures-all-nitrogen,
@@ -264,21 +269,27 @@
         netide-csit-1node-basic-only-nitrogen,
         netvirt-csit-1node-openstack-mitaka-upstream-learn-nitrogen,
         netvirt-csit-1node-openstack-mitaka-upstream-stateful-nitrogen,
+        netvirt-csit-1node-openstack-mitaka-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-1node-openstack-mitaka-upstream-transparent-nitrogen,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
+        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-transparent-nitrogen,
         netvirt-csit-1node-openstack-newton-upstream-learn-nitrogen,
         netvirt-csit-1node-openstack-newton-upstream-stateful-nitrogen,
+        netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-1node-openstack-newton-upstream-transparent-nitrogen,
         netvirt-csit-3node-openstack-mitaka-upstream-learn-nitrogen,
         netvirt-csit-3node-openstack-mitaka-upstream-stateful-nitrogen,
+        netvirt-csit-3node-openstack-mitaka-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-3node-openstack-mitaka-upstream-transparent-nitrogen,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
+        netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-transparent-nitrogen,
         netvirt-csit-3node-openstack-newton-upstream-learn-nitrogen,
         netvirt-csit-3node-openstack-newton-upstream-stateful-nitrogen,
+        netvirt-csit-3node-openstack-newton-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-3node-openstack-newton-upstream-transparent-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-learn-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-stateful-nitrogen,
@@ -417,6 +428,8 @@
         didm-csit-1node-discovery-only-carbon,
         distribution-csit-1node-userfeatures-all-carbon,
         distribution-csit-1node-userfeatures-only-carbon,
+        dluxapps-csit-1node-yangman-all-carbon,
+        dluxapps-csit-1node-yangman-only-carbon,
         eman-csit-1node-model-all-carbon,
         eman-csit-1node-model-only-carbon,
         genius-csit-1node-genius-all-carbon,
@@ -451,6 +464,7 @@
         natapp-csit-1node-basic-only-carbon,
         nemo-csit-1node-engine-all-carbon,
         nemo-csit-1node-engine-only-carbon,
+        netconf-csit-1node-callhome-only-carbon,
         netconf-csit-1node-periodic-scale-all-carbon,
         netconf-csit-1node-periodic-scale-only-carbon,
         netconf-csit-1node-userfeatures-all-carbon,
@@ -465,13 +479,16 @@
         netide-csit-1node-basic-only-carbon,
         netvirt-csit-1node-openstack-mitaka-upstream-learn-carbon,
         netvirt-csit-1node-openstack-mitaka-upstream-stateful-carbon,
+        netvirt-csit-1node-openstack-mitaka-upstream-stateful-snat-conntrack-carbon,
         netvirt-csit-1node-openstack-mitaka-upstream-transparent-carbon,
         netvirt-csit-1node-openstack-newton-nodl-v2-extensions-sfc-carbon,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
+        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-carbon,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-transparent-carbon,
         netvirt-csit-1node-openstack-newton-upstream-learn-carbon,
         netvirt-csit-1node-openstack-newton-upstream-stateful-carbon,
+        netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-carbon,
         netvirt-csit-1node-openstack-newton-upstream-transparent-carbon,
         netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
         netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
@@ -479,12 +496,15 @@
         netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-mitaka-upstream-learn-carbon,
         netvirt-csit-3node-openstack-mitaka-upstream-stateful-carbon,
+        netvirt-csit-3node-openstack-mitaka-upstream-stateful-snat-conntrack-carbon,
         netvirt-csit-3node-openstack-mitaka-upstream-transparent-carbon,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
+        netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-carbon,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-transparent-carbon,
         netvirt-csit-3node-openstack-newton-upstream-learn-carbon,
         netvirt-csit-3node-openstack-newton-upstream-stateful-carbon,
+        netvirt-csit-3node-openstack-newton-upstream-stateful-snat-conntrack-carbon,
         netvirt-csit-3node-openstack-newton-upstream-transparent-carbon,
         netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-learn-carbon,
         netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-stateful-carbon,
@@ -662,12 +682,15 @@
         netide-csit-1node-basic-only-boron,
         netvirt-csit-1node-openstack-mitaka-upstream-learn-boron,
         netvirt-csit-1node-openstack-mitaka-upstream-stateful-boron,
+        netvirt-csit-1node-openstack-mitaka-upstream-stateful-snat-conntrack-boron,
         netvirt-csit-1node-openstack-mitaka-upstream-transparent-boron,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-learn-boron,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
+        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-boron,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-transparent-boron,
         netvirt-csit-1node-openstack-newton-upstream-learn-boron,
         netvirt-csit-1node-openstack-newton-upstream-stateful-boron,
+        netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-boron,
         netvirt-csit-1node-openstack-newton-upstream-transparent-boron,
         netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-learn-boron,
         netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
@@ -675,12 +698,15 @@
         netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-3node-openstack-mitaka-upstream-learn-boron,
         netvirt-csit-3node-openstack-mitaka-upstream-stateful-boron,
+        netvirt-csit-3node-openstack-mitaka-upstream-stateful-snat-conntrack-boron,
         netvirt-csit-3node-openstack-mitaka-upstream-transparent-boron,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-boron,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
+        netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-boron,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-transparent-boron,
         netvirt-csit-3node-openstack-newton-upstream-learn-boron,
         netvirt-csit-3node-openstack-newton-upstream-stateful-boron,
+        netvirt-csit-3node-openstack-newton-upstream-stateful-snat-conntrack-boron,
         netvirt-csit-3node-openstack-newton-upstream-transparent-boron,
         netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-learn-boron,
         netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-stateful-boron,