From b889baa299c08b3ff7dbb1714a990cb218061efb Mon Sep 17 00:00:00 2001 From: Ignatious Johnson Christopher Date: Sun, 4 Dec 2016 21:49:24 -0800 Subject: [PATCH] Using python certifi from xenial repo in trusty builds to get the fix in certifi package to use the ubuntu's system wide CA's. Change-Id: I4270b1230550b5fbf718ab01c51ba97e1b2bee2c Closes-Bug: 1630513 (cherry picked from commit 7acd1ab51453f935d9980e922f3a3cc1eada836d) --- .../icehouse/depends_contrail_thirdparty_packages.cfg | 6 +++--- .../juno/depends_contrail_thirdparty_packages.cfg | 8 ++++---- .../kilo/depends_contrail_thirdparty_packages.cfg | 8 ++++---- .../liberty/depends_contrail_thirdparty_packages.cfg | 8 ++++---- .../mitaka/depends_contrail_thirdparty_packages.cfg | 8 ++++---- .../vcenter/depends_contrail_thirdparty_packages.cfg | 6 +++--- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/build/package_configs/ubuntu1404/icehouse/depends_contrail_thirdparty_packages.cfg b/build/package_configs/ubuntu1404/icehouse/depends_contrail_thirdparty_packages.cfg index f054ddc7a..7f307a0d1 100644 --- a/build/package_configs/ubuntu1404/icehouse/depends_contrail_thirdparty_packages.cfg +++ b/build/package_configs/ubuntu1404/icehouse/depends_contrail_thirdparty_packages.cfg @@ -63,9 +63,9 @@ md5 = d29d2a9f3ff8710e89b9a09bd26494d1 file = python-backports.ssl-match-hostname_3.4.0.2-1contrail1_all.deb md5 = 243c920a5c91d12801c525f3dcd2a6d1 -[python-certifi_1.0.1-1contrail1] -file = python-certifi_1.0.1-1contrail1_all.deb -md5 = 46ab19b4096c653c10854f5c5e735f1c +[python-certifi_2015.11.20.1-2] +file = python-certifi_2015.11.20.1-2_all.deb +md5 = 760985befd8570b30f5ae928862fa8ff [python-consistent-hash_1.0-0contrail1] file = python-consistent-hash_1.0-0contrail1_amd64.deb diff --git a/build/package_configs/ubuntu1404/juno/depends_contrail_thirdparty_packages.cfg b/build/package_configs/ubuntu1404/juno/depends_contrail_thirdparty_packages.cfg index 4946fb343..cd0b9543b 100644 --- a/build/package_configs/ubuntu1404/juno/depends_contrail_thirdparty_packages.cfg +++ b/build/package_configs/ubuntu1404/juno/depends_contrail_thirdparty_packages.cfg @@ -91,10 +91,10 @@ file = python-cassandra-driver_3.0.0-0contrail3_amd64.deb md5 = dbedcd22c6dd20436b56e8fdb0b3983f source = repo:contrail-thirdparty -[python-certifi_1.0.1-1contrail1] -file = python-certifi_1.0.1-1contrail1_all.deb -md5 = 46ab19b4096c653c10854f5c5e735f1c -source = repo:contrail-thirdparty +[python-certifi_2015.11.20.1-2] +file = python-certifi_2015.11.20.1-2_all.deb +md5 = 760985befd8570b30f5ae928862fa8ff +source = repo:xenial [python-consistent-hash_1.0-0contrail1] file = python-consistent-hash_1.0-0contrail1_amd64.deb diff --git a/build/package_configs/ubuntu1404/kilo/depends_contrail_thirdparty_packages.cfg b/build/package_configs/ubuntu1404/kilo/depends_contrail_thirdparty_packages.cfg index 07907ff01..84e6a4486 100644 --- a/build/package_configs/ubuntu1404/kilo/depends_contrail_thirdparty_packages.cfg +++ b/build/package_configs/ubuntu1404/kilo/depends_contrail_thirdparty_packages.cfg @@ -102,10 +102,10 @@ file = python-cassandra-driver_3.0.0-0contrail3_amd64.deb md5 = dbedcd22c6dd20436b56e8fdb0b3983f source = repo:contrail-thirdparty -[python-certifi_1.0.1-1contrail1] -file = python-certifi_1.0.1-1contrail1_all.deb -md5 = 46ab19b4096c653c10854f5c5e735f1c -source = repo:contrail-thirdparty +[python-certifi_2015.11.20.1-2] +file = python-certifi_2015.11.20.1-2_all.deb +md5 = 760985befd8570b30f5ae928862fa8ff +source = repo:xenial [python-consistent-hash_1.0-0contrail1] file = python-consistent-hash_1.0-0contrail1_amd64.deb diff --git a/build/package_configs/ubuntu1404/liberty/depends_contrail_thirdparty_packages.cfg b/build/package_configs/ubuntu1404/liberty/depends_contrail_thirdparty_packages.cfg index 0c2c152d6..7112f7e88 100644 --- a/build/package_configs/ubuntu1404/liberty/depends_contrail_thirdparty_packages.cfg +++ b/build/package_configs/ubuntu1404/liberty/depends_contrail_thirdparty_packages.cfg @@ -102,10 +102,10 @@ file = python-cassandra-driver_3.0.0-0contrail1_amd64.deb md5 = 70a9176db6b07f0f7f93a24fff1fa6dc source = repo:contrail-thirdparty -[python-certifi_1.0.1-1contrail1] -file = python-certifi_1.0.1-1contrail1_all.deb -md5 = 46ab19b4096c653c10854f5c5e735f1c -source = repo:contrail-thirdparty +[python-certifi_2015.11.20.1-2] +file = python-certifi_2015.11.20.1-2_all.deb +md5 = 760985befd8570b30f5ae928862fa8ff +source = repo:xenial [python-consistent-hash_1.0-0contrail1] file = python-consistent-hash_1.0-0contrail1_amd64.deb diff --git a/build/package_configs/ubuntu1404/mitaka/depends_contrail_thirdparty_packages.cfg b/build/package_configs/ubuntu1404/mitaka/depends_contrail_thirdparty_packages.cfg index cd057819b..bb6d6f7f8 100644 --- a/build/package_configs/ubuntu1404/mitaka/depends_contrail_thirdparty_packages.cfg +++ b/build/package_configs/ubuntu1404/mitaka/depends_contrail_thirdparty_packages.cfg @@ -160,10 +160,10 @@ file = python-cassandra-driver_3.0.0-0contrail1_amd64.deb md5 = 70a9176db6b07f0f7f93a24fff1fa6dc source = repo:contrail-thirdparty/ -[python-certifi_1.0.1-1contrail1] -file = python-certifi_1.0.1-1contrail1_all.deb -md5 = 46ab19b4096c653c10854f5c5e735f1c -source = repo:contrail-thirdparty/ +[python-certifi_2015.11.20.1-2] +file = python-certifi_2015.11.20.1-2_all.deb +md5 = 760985befd8570b30f5ae928862fa8ff +source = repo:xenial [python-consistent-hash_1.0-0contrail1] file = python-consistent-hash_1.0-0contrail1_amd64.deb diff --git a/build/package_configs/ubuntu1404/vcenter/depends_contrail_thirdparty_packages.cfg b/build/package_configs/ubuntu1404/vcenter/depends_contrail_thirdparty_packages.cfg index 557ca28f0..3712c6463 100644 --- a/build/package_configs/ubuntu1404/vcenter/depends_contrail_thirdparty_packages.cfg +++ b/build/package_configs/ubuntu1404/vcenter/depends_contrail_thirdparty_packages.cfg @@ -59,9 +59,9 @@ md5 = 243c920a5c91d12801c525f3dcd2a6d1 file = python-cassandra-driver_3.0.0-0contrail3_amd64.deb md5 = dbedcd22c6dd20436b56e8fdb0b3983f -[python-certifi_1.0.1-1contrail1] -file = python-certifi_1.0.1-1contrail1_all.deb -md5 = 46ab19b4096c653c10854f5c5e735f1c +[python-certifi_2015.11.20.1-2] +file = python-certifi_2015.11.20.1-2_all.deb +md5 = 760985befd8570b30f5ae928862fa8ff [python-consistent-hash_1.0-0contrail1] file = python-consistent-hash_1.0-0contrail1_amd64.deb