Skip to content

Commit

Permalink
Merge "Dont package python-pip and remove its dependency from contrai…
Browse files Browse the repository at this point in the history
…l packages"
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Jan 14, 2016
2 parents 97e9a23 + e611020 commit f4dd2e2
Show file tree
Hide file tree
Showing 12 changed files with 1,713 additions and 1,038 deletions.
10 changes: 5 additions & 5 deletions build/package_configs/centos65/icehouse/depends_packages.cfg
Expand Up @@ -1399,6 +1399,11 @@ md5 = ae96ca52af388833201c5a811947d98e
file = pyOpenSSL-0.13.1-1.el6.x86_64.rpm
md5 = 958a4915f971ea4c06d49caa82a45f4e

[python-Fabric-1.7.5-1.1contrail0]
file = python-Fabric-1.7.5-1.1contrail0.noarch.rpm
md5 = f29701e4945e18d9916040eb22d6c4da
source = repo:contrail-thirdparty

[python-pycassa]
file = python-pycassa-1.10.0-0contrail.el6.noarch.rpm
md5 = 71eef65f8dd9a0c0025cc5a986a55657
Expand Down Expand Up @@ -1780,11 +1785,6 @@ md5 = 87bafdd4de6d3644d8294b3182bd464e
file = python-pbr-0.8.0-1.el6.noarch.rpm
md5 = b0465cee45c1e6d74b8208cdf5f685c1

[python-pip_1.3.1_4.el6]
file = python-pip-1.3.1-4.el6.noarch.rpm
md5 = 498a8b24337fca4e81dbb75a8de5eb9f
package_type = contrail-install-packages, contrail-dependent-packages, contrail-installer-packages

[python-ply_3.4_4.el6]
file = python-ply-3.4-4.el6.noarch.rpm
md5 = c019e2621e1130f7324c642ab1bb35d3
Expand Down
Expand Up @@ -1587,10 +1587,6 @@ md5 = cb1d93abe7e7fc096f668e832a6562e6
file = python-cmd2-0.6.7-5.el7.centos.noarch.rpm
md5 = 4a9feb9d45a458bffad33dd015b70086

[python-crypto-2.6.1-1.el7.centos]
file = python-crypto-2.6.1-1.el7.centos.x86_64.rpm
md5 = 348fe0a5f0d7cbfb1ebf6cd444cb178d

[python-django-1.6.11-1.el7]
file = python-django-1.6.11-1.el7.noarch.rpm
md5 = def94241efad1faa270a45e981fd11d3
Expand Down Expand Up @@ -1811,10 +1807,6 @@ md5 = 14d7de92fead2c0f2e1a3b26198a3120
file = python-osprofiler-0.3.0-1.el7.centos.noarch.rpm
md5 = 1777ce73f0c60346032287cc9668ca1c

[python-paramiko-1.15.1-1.el7]
file = python-paramiko-1.15.1-1.el7.noarch.rpm
md5 = 80e481b4619e04d74a042d770ec5cdb4

[python-passlib-1.5.3-4.el7]
file = python-passlib-1.5.3-4.el7.noarch.rpm
md5 = ba20896c73227e1c4e1808babd3d8e72
Expand Down
Expand Up @@ -71,6 +71,10 @@ md5 = 7b70c5c66919c0165339cbd2c4cb39f7
file = mpfr-3.1.1-4.el7.x86_64.rpm
md5 = fc9e39143a34eb3b7c2c0cedb7f62521

[python-crypto-2.6.1-1.el7.centos]
file = python-crypto-2.6.1-1.el7.centos.x86_64.rpm
md5 = 348fe0a5f0d7cbfb1ebf6cd444cb178d

[python-deltarpm-3.6-3.el7]
file = python-deltarpm-3.6-3.el7.x86_64.rpm
md5 = 9c8deee0eb9a7fa329835e3eb730aad6
Expand All @@ -79,11 +83,15 @@ md5 = 9c8deee0eb9a7fa329835e3eb730aad6
file = python-devel-2.7.5-16.el7.x86_64.rpm
md5 = ccc1ca75c0a2e80434a5fd4610476a83

[python-Fabric-1.7.5-1.1contrail0]
file = python-Fabric-1.7.5-1.1contrail0.noarch.rpm
md5 = e3a4b8cc6271229a76545645564dd4b5
source = repo:contrail-thirdparty

[python-netaddr-0.7.12-1.el7.centos]
file = python-netaddr-0.7.12-1.el7.centos.noarch.rpm
md5 = 44c064287603632a53b1652a28569f7a

[python-pip-1.5.6-5.el7]
file = python-pip-1.5.6-5.el7.noarch.rpm
md5 = 2976dd5a13fee518fe45b71932602c5f

[python-paramiko-1.15.1-1.el7]
file = python-paramiko-1.15.1-1.el7.noarch.rpm
md5 = 80e481b4619e04d74a042d770ec5cdb4
Expand Up @@ -113,6 +113,11 @@ file = python-ecdsa-0.11-3.el7.centos.noarch.rpm
md5 = d0e0370629d546b390ec258e12292147
source = repo:extras

[python-Fabric-1.7.5-1.1contrail0]
file = python-Fabric-1.7.5-1.1contrail0.noarch.rpm
md5 = e3a4b8cc6271229a76545645564dd4b5
source = repo:contrail-thirdparty

[python-libs-2.7.5-18.el7_1.1]
file = python-libs-2.7.5-18.el7_1.1.x86_64.rpm
md5 = 3282f0452b3df00b5b0bd0024e00464c
Expand All @@ -128,11 +133,6 @@ file = python-paramiko-1.15.1-1.el7.noarch.rpm
md5 = 80e481b4619e04d74a042d770ec5cdb4
source = repo:epel

[python-pip-7.1.0-1.el7]
file = python-pip-7.1.0-1.el7.noarch.rpm
md5 = 3e68cff5af668e655a39a3768c4acf50
source = repo:epel

[python-six-1.9.0-1.el7]
file = python-six-1.9.0-1.el7.noarch.rpm
md5 = 5b5d6c1b71a6a47a9f2b66078f526791
Expand Down
Expand Up @@ -1054,6 +1054,12 @@ md5 = 415e3708d074a51b7f909495f53b1d43
file = patch-2.7.1-8.el7.x86_64.rpm
md5 = 2b832656dc91ad51d3e508c37071e805

[python-Fabric-1.7.5-1.1contrail0]
file = python-Fabric-1.7.5-1.1contrail0.noarch.rpm
md5 = 67ccac8fb4b7add866d274e878f036ad
package_type = contrail-install-packages
source = repo:contrail-thirdparty

[python-pbr-0.8.0-1]
file = python-pbr-0.8.0-1.el7.noarch.rpm
md5 = b0ec01ab384a6958485f3f8ba44e4126
Expand Down Expand Up @@ -1658,10 +1664,6 @@ md5 = e02982ad16e14f3d23b38469004b7eb0
file = python-pillow-2.0.0-17.gitd1c6db8.el7.x86_64.rpm
md5 = cb7ef812d65273190695a177951a6676

[python-pip_1.3.1_4.el7ost]
file = python-pip-1.3.1-4.el7ost.noarch.rpm
md5 = d1ab5fe29c0cb4930ac3809a05c3a618

[python-ply_3.4_4.el7ost]
file = python-ply-3.4-4.el7ost.noarch.rpm
md5 = 266fefdbac29a151368ba8bf3103de5b
Expand Down
Expand Up @@ -2013,6 +2013,12 @@ md5 = 635f3c837e78de07f3c2b4e14c90b9ab
file = python-eventlet-0.15.2-1.el7ost.noarch.rpm
md5 = 8d9e5caec558defff4f18daab490565f

[python-Fabric-1.7.5-1.1contrail0]
file = python-Fabric-1.7.5-1.1contrail0.noarch.rpm
md5 = 67ccac8fb4b7add866d274e878f036ad
package_type = contrail-install-packages
source = repo:contrail-thirdparty

[python-gevent_1.0_2.el7]
file = python-gevent-1.0-2.el7.x86_64.rpm
md5 = 4e2922218d4224fa3c30eb2ba2571300
Expand Down Expand Up @@ -2239,10 +2245,6 @@ md5 = 5340047c7b9823680a359c0e3ef2d747
file = python-pillow-2.0.0-17.gitd1c6db8.el7.x86_64.rpm
md5 = cb7ef812d65273190695a177951a6676

[python-pip_1.5.6_5.el7]
file = python-pip-1.5.6-5.el7.noarch.rpm
md5 = 2976dd5a13fee518fe45b71932602c5f

[python-posix_ipc_0.9.8_1.el7ost]
file = python-posix_ipc-0.9.8-1.el7ost.x86_64.rpm
md5 = cd23627fe1d2b82b1ef0a25f3bcf1b29
Expand Down
@@ -0,0 +1,195 @@
# ****************************************************************************
# CAUTION: ANY CHANGES TO DEFAULT SECTION APPLIES TO ALL SECTIONS
# IF NOT OVERWRITTEN LOCALLY
# ****************************************************************************
# Usage:
# [package name]
# file = # file name of the package
#
# location = # location where the package file is available.
# # If location is empty, default value is applied
# # Default value = <cache-base-dir>/<os-dist>/<sku>/ and
# # its sub directories
#
# md5 = # md5 check sum of the package file
#
# package_type = # wrapper package name in which this package will be
# # packaged
# # eg. If a section has package_type - contrail-dependent-packages
# # then that package file will be packaged in
# # the wrapper package contrail-dependent-packages
#
# source = # provide reference to the source of the package
# #
# # supported values -
# # repo:<name> - package belongs to the repo specified in <name>.
# # Use upstream repo name or contrail repo names
# # http://<server>/path - Url from which the package is downloaded
# ****************************************************************************

[DEFAULT]
file =
md5 =
location =
package_type = contrail-install-packages

[authbind-2.1.1-0]
file = authbind-2.1.1-0.x86_64.rpm
md5 = f573f94b5333c87b3154b024de259e97
source = repo:contrail-thirdparty

[bigtop-utils-0.6.0+243-1.cdh4.7.0.p0.17.el6]
file = bigtop-utils-0.6.0+243-1.cdh4.7.0.p0.17.el6.noarch.rpm
md5 = 4a02c32568bde3d6c74257f925de491a
source = repo:contrail-thirdparty

[cassandra20-2.0.17-1.noarch.rpm]
file = cassandra20-2.0.17-1.noarch.rpm
md5 = 0adf976fefbcfbaaf0b724a80f68cccc
source = repo:contrail-thirdparty

[cassandra21-2.1.9-1]
file = cassandra21-2.1.9-1.noarch.rpm
md5 = cae6ad6089fd15df384303b66cab594f
source = repo:contrail-thirdparty

[cassandra-cpp-driver-2.2.0-1.el7]
file = cassandra-cpp-driver-2.2.0-1.el7.centos.x86_64.rpm
md5 = 7b1f66c4fcfdd2e85f981b2c3a12089f
package_type = contrail-install-packages
source = repo:datastax

[consistent_hash-1.0-0contrail0.el7]
file = consistent_hash-1.0-0contrail0.el7.noarch.rpm
md5 = d90efcd375a4b89639f80786d73114e2
source = repo:contrail-thirdparty

[euca2ools-1.0-2contrail]
file = euca2ools-1.0-2contrail.x86_64.rpm
md5 = e83decbf4017da6f47696842aa909e13
source = repo:contrail-thirdparty

[hc-httpcore-4.1-1.jpp6]
file = hc-httpcore-4.1-1.jpp6.noarch.rpm
md5 = 65d9fbf17070841708643f7eaa000071
source = repo:contrail-thirdparty

[ifmap-server-0.3.2-2contrail.el7]
file = ifmap-server-0.3.2-2contrail.el7.noarch.rpm
md5 = 3f89792cf3d8a781e7e38f17e5b2e6f6
source = repo:contrail-thirdparty

[kafka-2.10-0.9.0.0_SNAPSHOT.0contrail0.el7]
file = kafka-2.10-0.9.0.0_SNAPSHOT.0contrail0.el7.x86_64.rpm
md5 = 3b0864872aaa91690cde2829e1d55637
source = repo:contrail-thirdparty

[librdkafka-devel-0.8.5-2.0contrail0.el7.centos]
file = librdkafka-devel-0.8.5-2.0contrail0.el7.centos.x86_64.rpm
md5 = 031fadbf1a27758a9bbdb168b4015842
source = repo:contrail-thirdparty

[librdkafka1-0.8.5-2.0contrail0.el7.centos]
file = librdkafka1-0.8.5-2.0contrail0.el7.centos.x86_64.rpm
md5 = 31d466cee10e29c3c5e8811163879828
source = repo:contrail-thirdparty

[nodejs-0.10.35-1contrail.el7]
file = nodejs-0.10.35-1contrail.el7.x86_64.rpm
md5 = 788131e83c0dc24b64f5623c9c11e7f4
source = repo:contrail-thirdparty

[python-bitarray-0.8.0-0contrail.el7]
file = python-bitarray-0.8.0-0contrail.el7.x86_64.rpm
md5 = d1330f60ab5e7b9102da9706345f671d
source = repo:contrail-thirdparty

[python-boto-2.12.0-2contrail.el7]
file = python-boto-2.12.0-2contrail.el7.x86_64.rpm
md5 = de2aa10a5958e7f16b7dcbac3d1d952b
source = repo:contrail-thirdparty

[python-bottle-0.11.6-0contrail.el7]
file = python-bottle-0.11.6-0contrail.el7.noarch.rpm
md5 = 3fa8a2c1b303252e21a08f78cb4b8b18
source = repo:contrail-thirdparty

[python-cassandra-driver-3.0.0-0contrail1.el7]
file = python-cassandra-driver-3.0.0-0contrail1.el7.x86_64.rpm
md5 = 71a86febc460a84d3e82838336f6fe6f
source = repo:contrail-thirdparty

[python-docker-py-0.7.2-1.1contrail1.el7]
file = python-docker-py-0.7.2-1.1contrail1.el7.noarch.rpm
md5 = 73393400804fc254a6b24d3b35065a9a
source = repo:contrail-thirdparty

[python-geventhttpclient-1.0a-0contrail.el7]
file = python-geventhttpclient-1.0a-0contrail.el7.x86_64.rpm
md5 = 045388afa560fce0ebdd47bf18bef3b5
source = repo:contrail-thirdparty

[python-jsonpickle-0.3.1-2.1.el7]
file = python-jsonpickle-0.3.1-2.1.el7.noarch.rpm
md5 = b8686001c5202e5ee4eb25230dd7ba1d
source = repo:contrail-thirdparty

[python-kafka-python-0.9.4-1.1.noarch]
file = python-kafka-python-0.9.4-1.1.noarch.rpm
md5 = d6901cbe82f61880ba7c741f65e68fb3
source = repo:contrail-thirdparty

[python-kazoo-1.3.1-1.1contrail2.el7]
file = python-kazoo-1.3.1-1.1contrail2.el7.noarch.rpm
md5 = 2e8af639466a04468a0be23b3bdb2e2d
source = repo:contrail-thirdparty

[python-ncclient-0.3.2-1.0contrail0.el7]
file = python-ncclient-0.3.2-1.0contrail0.el7.noarch.rpm
md5 = d8abaea02f24939f15fe118d5238c851
source = repo:contrail-thirdparty

[python-neutronclient-2.4.0-2contrail.el7]
file = python-neutronclient-2.4.0-2contrail.el7.noarch.rpm
md5 = 9fa744f7334b0020a1d203d9117a7ef4
source = repo:contrail-thirdparty

[python-pycassa-1.10.0-0contrail.el7]
file = python-pycassa-1.10.0-0contrail.el7.noarch.rpm
md5 = 62641a22f76d2b5a1c030a9e32f8f897
source = repo:contrail-thirdparty

[python-requests-2.6.0-1.1contrail1.el7]
file = python-requests-2.6.0-1.1contrail1.el7.noarch.rpm
md5 = 6316c0ae19e6063c0c4af8aee36e501f
source = repo:contrail-thirdparty

[python-thrift-0.9.1-0contrail.el7]
file = python-thrift-0.9.1-0contrail.el7.x86_64.rpm
md5 = 8a57025dfd403b8f719a83012f7d7b4a
source = repo:contrail-thirdparty

[python-unittest2-0.5.1-6.el7]
file = python-unittest2-0.5.1-6.el7.noarch.rpm
md5 = dcdb827f880ab35707a2cbc1ca51a45d
source = repo:contrail-thirdparty

[redis-py-0.1-2contrail.el7]
file = redis-py-0.1-2contrail.el7.noarch.rpm
md5 = 7c402a8bd07a9d54c4a7193fabc71fd1
source = repo:contrail-thirdparty

[tunctl-1.5-3.el6]
file = tunctl-1.5-3.el6.x86_64.rpm
md5 = 5bd82e4f47b1e0fc7843de49c7afa5f1
source = repo:contrail-thirdparty

[xmltodict-0.7.0-0contrail.el7]
file = xmltodict-0.7.0-0contrail.el7.noarch.rpm
md5 = dc1d4fe49d51c5d80597dfe51502de26
source = repo:contrail-thirdparty

[zookeeper-3.4.3-1.el6]
file = zookeeper-3.4.3-1.el6.noarch.rpm
md5 = 40295fd03e32a767acda161dca3a04db
source = repo:contrail-thirdparty

0 comments on commit f4dd2e2

Please sign in to comment.