Merge "Don't allow retry to fail stacking"

[releng/builder.git] / jjb / releng-defaults.yaml

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 51b9bc8a154d3668257c83b192cdb9b2d288dc9b..839171392d4c6e3aafd6d74621483c6b688abd56 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -74,19 +74,19 @@
     openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1
-    docker_system_flavor: v1-performance-1
+    docker_system_flavor: v2-standard-1
     docker_system_image: ZZCI - CentOS 7 - docker - 20180109-0346
     odl_system_count: 1
-    odl_system_flavor: v1-performance-2
+    odl_system_flavor: v2-highcpu-4
     odl_system_image: ZZCI - CentOS 7 - builder - 20180201-2139
     openstack_system_count: 1
-    openstack_system_flavor: v1-performance-4
+    openstack_system_flavor: v2-standard-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     openstack_system2_count: 0
-    openstack_system2_flavor: v1-performance-1
+    openstack_system2_flavor: v2-standard-1
     openstack_system2_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     tools_system_count: 1
-    tools_system_flavor: v1-performance-1
+    tools_system_flavor: v2-highcpu-2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
     # Default Robot framework options
@@ -106,7 +106,6 @@
     # Maven / Java
     java-version: 'openjdk8'
     jre: 'openjdk8'
-    jdk: 'openjdk8'
     opendaylight-infra-mvn-opts: |
         --show-version
         --batch-mode