Merge "Add support for jdk11 in magnesium"

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 010a1c4e8cde92a91800e5fa72460d25d3c3f5f7..6e3b28c3549fbb4e3ef9762a5bb824177e4e6d50 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -78,7 +78,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
@@ -184,7 +184,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
@@ -487,7 +487,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
@@ -596,7 +596,7 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
@@ -901,7 +901,7 @@
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
     docker_system_count: 1
     docker_system_flavor: 'odl-standard-1'
     docker_system_image: 'ZZCI - CentOS 7 - docker - 20180723-235456.035'
@@ -1033,7 +1033,7 @@
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
     openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
@@ -1445,7 +1445,7 @@
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
     openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
@@ -1910,6 +1910,8 @@
     builders:
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - maven-target:
           maven-version: mvn35
           pom: '{project}/pom.xml'
@@ -1923,7 +1925,7 @@
               {opendaylight-infra-mvn-opts}
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
-            - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+            - '-Xmx4096m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings
@@ -1939,7 +1941,7 @@
               {opendaylight-infra-mvn-opts}
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
-            - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+            - '-Xmx1024m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings