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 cd16b8530f02a0a382b333ae42d185d5dcfef217..839171392d4c6e3aafd6d74621483c6b688abd56 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -77,7 +77,7 @@
     docker_system_flavor: v2-standard-1
     docker_system_image: ZZCI - CentOS 7 - docker - 20180109-0346
     odl_system_count: 1
-    odl_system_flavor: v2-standard-2
+    odl_system_flavor: v2-highcpu-4
     odl_system_image: ZZCI - CentOS 7 - builder - 20180201-2139
     openstack_system_count: 1
     openstack_system_flavor: v2-standard-4
@@ -106,7 +106,6 @@
     # Maven / Java
     java-version: 'openjdk8'
     jre: 'openjdk8'
-    jdk: 'openjdk8'
     opendaylight-infra-mvn-opts: |
         --show-version
         --batch-mode