X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=6e3b28c3549fbb4e3ef9762a5bb824177e4e6d50;hb=6632a5342479c09112b04e7fdd54f3c58d16c042;hp=9bd6aa31f9090a53289b74fea30289ada42f997e;hpb=046d5f8049d60a1f30dc28827b7c797310642c58;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 9bd6aa31f..6e3b28c35 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -78,10 +78,10 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621'
+    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 - 20190201-040143.366'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
 
     #####################
     # Job configuration #
@@ -184,10 +184,10 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621'
+    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 - 20190201-040143.366'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
 
     #####################
     # Job configuration #
@@ -487,10 +487,10 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621'
+    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 - 20190201-040143.366'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
 
     #####################
     # Job Configuration #
@@ -596,10 +596,10 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621'
+    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 - 20190201-040143.366'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
 
     #####################
     # Job configuration #
@@ -901,7 +901,7 @@
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621'
+    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 - 20190401-060226.621'
+    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'
@@ -1042,7 +1042,7 @@
     openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
 
     #####################
     # Job configuration #
@@ -1445,7 +1445,7 @@
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190401-060226.621'
+    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'
@@ -1454,7 +1454,7 @@
     openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
 
     #####################
     # Job configuration #
@@ -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