Merge "Update global-jjb to v0.21.1"

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index bbc01757f5108bc2cb5d1a31428596d0ab3fb9ed..1200269dad8ec12bf95d4275571154f9d4161442 100644 (file)
--- 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 ccbf90abd1951cf6bf4b8200888fcb538fd91718..766f3897773fe1a9155668fcd9c2de64072bc1f3 100644 (file)
--- 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 7ce45c96dbc1e231f82b53c1b59370c9a041aa84..275e6c9c4a2613e88917aa4daafb5b694ca97e85 100644 (file)
--- 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 (file)
index 0000000..565bd6f
--- /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}'