From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Thu, 21 Jun 2018 14:40:27 +0000 (+0000)
Subject: Merge "Update global-jjb to v0.21.1"
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0b6cc391caff97b2b5300406c4b904c3880bc2d4;hp=050d2da3078e7ddb56b0b0ac10a4d3d159315ded;p=releng%2Fbuilder.git

Merge "Update global-jjb to v0.21.1"
---

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index bbc01757f..1200269da 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -26,7 +26,7 @@
     devstack-networking-sfc-plugin-repo: 'https://github.com/openstack/networking-sfc'
 
     # lf-infra defaults
-    jenkins-ssh-credential: opendaylight-jenkins-ssh
+    jenkins-ssh-credential: jenkins-ssh
     gerrit-server-name: OpenDaylight
     mvn-site-id: opendaylight-site
     mvn-snapshot-id: opendaylight-snapshot
diff --git a/jjb/integration/csit-jobs-fluorine.lst b/jjb/integration/csit-jobs-fluorine.lst
index ccbf90abd..766f38977 100644
--- a/jjb/integration/csit-jobs-fluorine.lst
+++ b/jjb/integration/csit-jobs-fluorine.lst
@@ -33,6 +33,8 @@ netvirt-csit-1node-openstack-pike-upstream-stateful-fluorine,
 netvirt-csit-1node-openstack-pike-upstream-stateful-itm-direct-tunnels-fluorine,
 netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-fluorine,
 netvirt-csit-1node-openstack-queens-sfc-fluorine,
+netvirt-csit-1node-openstack-queens-upgrade-fluorine,
+netvirt-csit-1node-openstack-queens-upgrade-snat-conntrack-fluorine,
 netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine,
 netvirt-csit-1node-openstack-queens-upstream-stateful-itm-direct-tunnels-fluorine,
 netvirt-csit-1node-openstack-queens-upstream-stateful-snat-conntrack-fluorine,
diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 7ce45c96d..275e6c9c4 100644
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -385,6 +385,10 @@ minimize_polling=True
 physical_network_mtus = ${PUBLIC_PHYSICAL_NETWORK}:1400
 path_mtu = 1458
 
+[ml2_odl]
+# Trigger n-odl full sync every 30 secs.
+maintenance_interval = 30
+
 [[post-config|/etc/neutron/dhcp_agent.ini]]
 [DEFAULT]
 force_metadata = True
diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
new file mode 100644
index 000000000..565bd6f18
--- /dev/null
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -0,0 +1,37 @@
+---
+- project:
+    name: netvirt-csit-upgrade-openstack-integration-oxygen
+    jobs:
+      - inttest-csit-openstack
+
+    project: 'netvirt'
+    stream: 'fluorine'
+    branch: 'master'
+    testplan: '{project}-{topology}-openstack-upgrade.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,l2gw-plugin'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
+
+    topology:
+      - 1node:
+          openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+
+    functionality:
+      - upgrade
+      - upgrade-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+
+    openstack:
+      - queens:
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'