Merge "Fix apt concurrency failures"

diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index f26188442a89ed599dd707fe92c7f028626a76ad..9169ef759ff63b5df18b12a09b2c0124e0bdbc0f 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -170,8 +170,6 @@ service_plugins = networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin
 EOF
 fi #check for ENABLE_NETWORKING_L2GW
 
-fi #check for ODL_ML2_BRANCH
-
 fi #ODL_ENABLE_L3_FWD check
 
 cat >> ${local_conf_file_name} << EOF

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index d71f5b0433366b20baecaa10d711d6e09f13eedc..bbc9318acd7efcaee7e248cbd640602cf4e76e8e 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -54,3 +54,6 @@
       - transparent-current:
           csit-list: >
               netvirt-csit-1node-openstack-newton-nodl-v2-gate-transparent-{stream}
+      - snat-conntrack:
+          csit-list: >
+              netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-{stream}