Print git-diff when pre-commit fails

[releng/builder.git] / jjb / netvirt / netvirt-csit-hwvtep-openstack.yaml

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 4d98bd450a529402e5b8991433bf4f2dbca5d29b..27f79f1f5b52e5390e02c0f414727c55592f0c9d 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-magnesium
+    name: netvirt-csit-hwvtep-openstack-integration-aluminium
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
-    stream: 'magnesium'
+    stream: 'aluminium'
     branch: 'master'
     jre: 'openjdk11'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
@@ -17,7 +17,7 @@
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -50,13 +50,14 @@
           openstack_system2_image: '{openstack_queens_system_image}'
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-sodium
+    name: netvirt-csit-hwvtep-openstack-integration-magnesium
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
-    stream: 'sodium'
-    branch: 'stable/sodium'
+    stream: 'magnesium'
+    branch: 'stable/magnesium'
+    jre: 'openjdk11'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
@@ -66,7 +67,7 @@
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -99,13 +100,13 @@
           openstack_system2_image: '{openstack_queens_system_image}'
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-neon
+    name: netvirt-csit-hwvtep-openstack-integration-sodium
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
-    stream: 'neon'
-    branch: 'stable/neon'
+    stream: 'sodium'
+    branch: 'stable/sodium'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
@@ -115,7 +116,7 @@
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2