This change will bring vrouter pacakge with 3.13.0-83 kernel version

for ubuntu1404/juno, kilo and liberty builds All buildVMs and build server need to support this kernel version Partial-Bug: #1566047 Change-Id: Ied0c4ff3e822b466bb7f0ea883d8fe6a2cd28f43
Juniper · Apr 5, 2016 · d8d5687 · d8d5687
1 parent dda818e
commit d8d5687
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 5 deletions.
diff --git a/build/package_configs/ubuntu1404/juno/contrail_packages.cfg b/build/package_configs/ubuntu1404/juno/contrail_packages.cfg
@@ -43,7 +43,7 @@ pkgs      = contrail-analytics, contrail-config, contrail-control, contrail-lib,
           contrail-nova-driver, contrail-vrouter-agent, contrail-vrouter-dkms,
           contrail-vrouter-dpdk, contrail-vrouter-source,
           contrail-vrouter-utils, python-contrail, python-contrail-vrouter-api,
-          contrail-vrouter-3.13.0-40-generic, contrail-config-openstack,
+          contrail-vrouter-3.13.0-83-generic, contrail-config-openstack,
           contrail-dns, python-opencontrail-vrouter-netns, contrail-utils,
           contrail-nodemgr, contrail-docs
 makeloc   = tools/packaging/common/debian

diff --git a/build/package_configs/ubuntu1404/juno/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/juno/depends_contrail_dependent_packages.cfg
@@ -1411,16 +1411,36 @@ file           = linux-headers-3.13.0-40_3.13.0-40.69_all.deb
 md5            = 2a60945600c4429f426dd7cadc6c73df
 source         = repo:trusty-updates
 
+[linux-headers-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-headers-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 5df332a60e776a0d0e79e54bdb291707
+source         = repo:trusty-security/main/
+
+[linux-headers-3.13.0-83_3.13.0-83.127]
+file           = linux-headers-3.13.0-83_3.13.0-83.127_all.deb
+md5            = 50bf914d576b43b2e28c1862c3638c82
+source         = repo:trusty-security/main/
+
 [linux-image-3.13.0-40-generic_3.13.0-40.69]
 file           = linux-image-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = a6ba0601c1f8662cad6604dfd9d070b0
 source         = repo:trusty-updates
 
+[linux-image-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 1488cbc687bebc497f2112f93131a727
+source         = repo:trusty-security/main/
+
 [linux-image-extra-3.13.0-40-generic_3.13.0-40.69]
 file           = linux-image-extra-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = 3b38dc787fcf8b8a1ccd89e60077df58
 source         = repo:trusty-updates
 
+[linux-image-extra-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-extra-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 4832e8b6a6654b8d20ae53f279ff878d
+source         = repo:trusty-security/main/
+
 [lksctp-tools_1.0.15+dfsg-1]
 file           = lksctp-tools_1.0.15+dfsg-1_amd64.deb
 md5            = 39373482904f27eddebcef56b9bcf13f

diff --git a/build/package_configs/ubuntu1404/kilo/contrail_packages.cfg b/build/package_configs/ubuntu1404/kilo/contrail_packages.cfg
@@ -42,7 +42,7 @@ pkgs      = contrail-analytics, contrail-config, contrail-control, contrail-lib,
           contrail-nova-driver, contrail-vrouter-agent, contrail-vrouter-dkms,
           contrail-vrouter-dpdk, contrail-vrouter-source,
           contrail-vrouter-utils, python-contrail, python-contrail-vrouter-api,
-          contrail-vrouter-3.13.0-40-generic, contrail-config-openstack,
+          contrail-vrouter-3.13.0-83-generic, contrail-config-openstack,
           contrail-dns, python-opencontrail-vrouter-netns, contrail-utils,
           contrail-nodemgr, contrail-docs
 makeloc   = tools/packaging/common/debian

diff --git a/build/package_configs/ubuntu1404/kilo/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/kilo/depends_contrail_dependent_packages.cfg
@@ -102,6 +102,11 @@ file           = cassandra_2.1.9_all.deb
 md5            = 4dcdf43471d6bcbef7ad3b79f63bd8b1
 source         = repo:contrail-thirdparty
 
+[cgmanager_0.24-0ubuntu7.1]
+file           = cgmanager_0.24-0ubuntu7.1_amd64.deb
+md5            = 222c12502e6fcb5d5897f51c158d33e8
+source         = repo:trusty-security/main/
+
 [cgroup-lite_1.9]
 file           = cgroup-lite_1.9_all.deb
 md5            = fe1749ba83aaf6d4f3e87ccdbc3581d4
@@ -1306,6 +1311,16 @@ file           = linux-headers-3.13.0-40_3.13.0-40.69_all.deb
 md5            = 2a60945600c4429f426dd7cadc6c73df
 source         = repo:trusty-updates
 
+[linux-headers-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-headers-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 5df332a60e776a0d0e79e54bdb291707
+source         = repo:trusty-security/main/
+
+[linux-headers-3.13.0-83_3.13.0-83.127]
+file           = linux-headers-3.13.0-83_3.13.0-83.127_all.deb
+md5            = 50bf914d576b43b2e28c1862c3638c82
+source         = repo:trusty-security/main/
+
 [linux-image-3.13.0-34-generic_3.13.0-34.60]
 file           = linux-image-3.13.0-34-generic_3.13.0-34.60_amd64.deb
 md5            = 860eee967a5f0b1e20d422839db84f7d
@@ -1321,6 +1336,11 @@ file           = linux-image-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = a6ba0601c1f8662cad6604dfd9d070b0
 source         = repo:trusty-updates
 
+[linux-image-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 1488cbc687bebc497f2112f93131a727
+source         = repo:trusty-security/main/
+
 [linux-image-extra-3.13.0-34-generic_3.13.0-34.60]
 file           = linux-image-extra-3.13.0-34-generic_3.13.0-34.60_amd64.deb
 md5            = e4c9fce04b06f0cfafcd0c0d1a494e40
@@ -1336,6 +1356,11 @@ file           = linux-image-extra-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = 3b38dc787fcf8b8a1ccd89e60077df58
 source         = repo:trusty-updates
 
+[linux-image-extra-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-extra-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 4832e8b6a6654b8d20ae53f279ff878d
+source         = repo:trusty-security/main/
+
 [linux-libc-dev_3.13.0-68.111]
 file           = linux-libc-dev_3.13.0-68.111_amd64.deb
 md5            = ac5595b89ffc06502e6ab57fa4db9aa1

diff --git a/build/package_configs/ubuntu1404/liberty/contrail_packages.cfg b/build/package_configs/ubuntu1404/liberty/contrail_packages.cfg
@@ -42,7 +42,7 @@ pkgs      = contrail-analytics, contrail-config, contrail-control, contrail-lib,
           contrail-nova-driver, contrail-vrouter-agent, contrail-vrouter-dkms,
           contrail-vrouter-source,
           contrail-vrouter-utils, python-contrail, python-contrail-vrouter-api,
-          contrail-vrouter-3.13.0-40-generic, contrail-config-openstack,
+          contrail-vrouter-3.13.0-83-generic, contrail-config-openstack,
           contrail-dns, python-opencontrail-vrouter-netns, contrail-utils,
           contrail-nodemgr, contrail-docs
 makeloc   = tools/packaging/common/debian

diff --git a/build/package_configs/ubuntu1404/liberty/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/liberty/depends_contrail_dependent_packages.cfg
@@ -718,16 +718,36 @@ file           = linux-headers-3.13.0-40_3.13.0-40.69_all.deb
 md5            = 2a60945600c4429f426dd7cadc6c73df
 source         = repo:trusty-updates
 
+[linux-headers-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-headers-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 5df332a60e776a0d0e79e54bdb291707
+source         = repo:trusty-security/main/
+
+[linux-headers-3.13.0-83_3.13.0-83.127]
+file           = linux-headers-3.13.0-83_3.13.0-83.127_all.deb
+md5            = 50bf914d576b43b2e28c1862c3638c82
+source         = repo:trusty-security/main/
+
 [linux-image-3.13.0-40-generic_3.13.0-40.69]
 file           = linux-image-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = a6ba0601c1f8662cad6604dfd9d070b0
 source         = repo:trusty-updates
 
+[linux-image-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 1488cbc687bebc497f2112f93131a727
+source         = repo:trusty-security/main/
+
 [linux-image-extra-3.13.0-40-generic_3.13.0-40.69]
 file           = linux-image-extra-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = 3b38dc787fcf8b8a1ccd89e60077df58
 source         = repo:trusty-updates
 
+[linux-image-extra-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-extra-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 4832e8b6a6654b8d20ae53f279ff878d
+source         = repo:trusty-security/main/
+
 [lksctp-tools_1.0.15+dfsg-1]
 file           = lksctp-tools_1.0.15+dfsg-1_amd64.deb
 md5            = 39373482904f27eddebcef56b9bcf13f

diff --git a/build/package_configs/ubuntu1404/vcenter/contrail_packages.cfg b/build/package_configs/ubuntu1404/vcenter/contrail_packages.cfg
@@ -29,7 +29,7 @@ pkgs      = contrail-analytics, contrail-config, contrail-control, contrail-lib,
           contrail-vrouter-source, contrail-vrouter-utils, python-contrail,
           python-contrail-vrouter-api, contrail-dns,
           python-opencontrail-vrouter-netns, contrail-utils, 
-          contrail-vrouter-3.13.0-40-generic, contrail-nodemgr, contrail-docs
+          contrail-vrouter-3.13.0-83-generic, contrail-nodemgr, contrail-docs
 makeloc   = tools/packaging/common/debian
 builtloc  = build/packages
 

diff --git a/build/package_configs/ubuntu1404/vcenter/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/vcenter/depends_contrail_dependent_packages.cfg
@@ -867,14 +867,34 @@ md5            = 5746e3f726d3828c48de16e4b37c7b75
 file           = linux-headers-3.13.0-40_3.13.0-40.69_all.deb
 md5            = 2a60945600c4429f426dd7cadc6c73df
 
+[linux-headers-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-headers-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 5df332a60e776a0d0e79e54bdb291707
+source         = repo:trusty-security/main/
+
+[linux-headers-3.13.0-83_3.13.0-83.127]
+file           = linux-headers-3.13.0-83_3.13.0-83.127_all.deb
+md5            = 50bf914d576b43b2e28c1862c3638c82
+source         = repo:trusty-security/main/
+
 [linux-image-3.13.0-40-generic_3.13.0-40.69]
 file           = linux-image-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = a6ba0601c1f8662cad6604dfd9d070b0
 
+[linux-image-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 1488cbc687bebc497f2112f93131a727
+source         = repo:trusty-security/main/
+
 [linux-image-extra-3.13.0-40-generic_3.13.0-40.69]
 file           = linux-image-extra-3.13.0-40-generic_3.13.0-40.69_amd64.deb
 md5            = 3b38dc787fcf8b8a1ccd89e60077df58
 
+[linux-image-extra-3.13.0-83-generic_3.13.0-83.127]
+file           = linux-image-extra-3.13.0-83-generic_3.13.0-83.127_amd64.deb
+md5            = 4832e8b6a6654b8d20ae53f279ff878d
+source         = repo:trusty-security/main/
+
 [lksctp-tools_1.0.15+dfsg-1]
 file           = lksctp-tools_1.0.15+dfsg-1_amd64.deb
 md5            = 39373482904f27eddebcef56b9bcf13f

diff --git a/common/debian/Makefile b/common/debian/Makefile
@@ -194,7 +194,7 @@ clean-%:
 
 KERNEL_VERSIONS := 3.8.0-29-generic 3.2.0-58-generic 3.2.0-51-generic 3.11.0-22-generic \
                    3.13.0-24-generic 3.8.0-31-generic 3.13.0-34-generic 3.13.0-35-generic \
-                   3.13.0-40-generic
+                   3.13.0-40-generic 3.13.0-83-generic
 
 AVAILABLE_KERNEL_VERSIONS := $(foreach kname, $(KERNEL_VERSIONS), $(shell [ -d /lib/modules/$(kname)/build ] && echo $(kname)))