Merge "Disable all Oxygen Jobs to save infra resources"

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
index c3eab9e1eafbffdadf437f4eb7eda992b9ffa103..5c435bfa13d70aecd438b5f4ff1b853df22bf8d3 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366
 HARDWARE_ID=odl-standard-1

diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml
index 3f965d9862f9ff9d5d7b5196bcdf2f60f2378291..b856640f58adf990643d6d775f99331ac3318663 100644 (file)
--- a/jjb/aaa/aaa-csit-tls.yaml
+++ b/jjb/aaa/aaa-csit-tls.yaml
@@ -33,4 +33,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 50b821a59189b707b5949b0fae977fded095c160..ef6157e41f7d94ec9d40d774dd90e38407c537cc 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -81,7 +81,7 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
@@ -187,7 +187,7 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
@@ -490,7 +490,7 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job Configuration #
@@ -599,7 +599,7 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
@@ -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 - 20181029-223449.514'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
@@ -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 - 20181029-223449.514'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #

diff --git a/packer/provision/kubernetes.yaml b/packer/provision/kubernetes.yaml
index 6378688b9d026e7bd5054cf7d7da0277ac18c3d8..1e18e76ff960f0045b4aeec7f222075e4797bbef 100644 (file)
--- a/packer/provision/kubernetes.yaml
+++ b/packer/provision/kubernetes.yaml
@@ -5,7 +5,7 @@
   vars:
     openvswitch_version: 2.8.2
     openvswitch_checksum: sha256:87b4a7e7134a44ce1f808d3415a2244b4518c2b0b2a42fa2f8231e592f13103d
-    k8s_version: 1.9.4
+    k8s_version: 1.13.2
     golang_version: 1.11.5
     golang_checksum: sha256:ff54aafedff961eb94792487e827515da683d61a5f9482f668008832631e5d25