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 9e93f52d942d7db967b08e31a9156185df61c813..ec0423d5a59e6402db061b0fc8bde4bcd4fbbe7a 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -37,6 +37,7 @@
     security-group-mode: 'none'
     tenant-network-type: 'vxlan'
     odl-sfc-driver: 'odl'
+    odl-snat-mode: 'controller'
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''
@@ -253,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,
@@ -267,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,
@@ -456,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,
@@ -470,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,
@@ -484,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,
@@ -667,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,
@@ -680,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,