From 5a81c83102c321922810543c6ff49f3663063104 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 14 Nov 2017 14:17:05 +1100 Subject: [PATCH] Remove some non-standard things from bindep-fallback Although we've removed RDO repositories, we've recently realised that several of these packages come from the centos-release-openstack-* repositories. This repo was brought in with Ia9c45b762eea9f2989c9c63fb944b9e5e1f17ed2 as part of install_puppet.sh migrations. We don't want this installed; specifically it makes things hard for tripelo, but generically it's better for jobs to explicitly depend on such repos. There's already been some workarounds in here with SuSE, which doesn't have liberasurecode (060b868520a83c422050c3d3a15c89bf52e93968) and so skips it. Since this is just a port of what was really ad-hoc packages that made up a devstack node, we should take opportunities to decrease anything in here to a LCD, rather than add workarounds. To this end, this change removes: liberasurecode-* mongodb-* python-zmq redis zookeeper from the fallback list. None of these are available in base centos7. As a consequence the skipping of liberasurecode and zookeeper on suse and gentoo respectively is removed too. At this point, any issues from removing these packages should be easily handled by local bindep installs. Change-Id: Iab9495bd381b135e8a0f2e8f35e51a9218cf8f40 --- jenkins/data/bindep-fallback.txt | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/jenkins/data/bindep-fallback.txt b/jenkins/data/bindep-fallback.txt index 5597ccba8b..dd322b7bac 100644 --- a/jenkins/data/bindep-fallback.txt +++ b/jenkins/data/bindep-fallback.txt @@ -20,9 +20,6 @@ media-gfx/graphviz [platform:gentoo] language-pack-en [platform:ubuntu] libcurl-devel [platform:rpm] libcurl4-gnutls-dev [platform:dpkg] -liberasurecode-dev [platform:dpkg] -liberasurecode-devel [platform:rpm !platform:opensuseproject] -dev-libs/liberasurecode [platform:gentoo] libevent-dev [platform:dpkg] libevent-devel [platform:rpm] dev-libs/libevent [platform:gentoo] @@ -70,9 +67,6 @@ mariadb-devel [platform:redhat] libmysqlclient-devel [platform:suse] dev-db/mariadb [platform:gentoo] memcached -mongodb [platform:dpkg] -mongodb-server [platform:rpm !platform:opensuseproject] -dev-db/mongodb [platform:gentoo] mysql-client [platform:dpkg] mysql-server [platform:dpkg] openldap-devel [platform:redhat] @@ -93,9 +87,6 @@ python-libvirt [platform:dpkg] python-lxml [!platform:gentoo !platform:fedora] python2-lxml [platform:fedora] dev-python/lxml [platform:gentoo] -python-zmq [!platform:gentoo !platform:fedora !platform:suse] -python2-zmq [platform:fedora] -dev-python/pyzmq [platform:gentoo] # Note that python3-all-dev includes python3-all, added # both here for documentary purpose. python3-all [platform:dpkg] @@ -108,9 +99,6 @@ python3-devel [platform:fedora platform:suse] # by python-devel as well. See https://bugzilla.suse.com/show_bug.cgi?id=1046990 python3 [platform:suse] python-xml [platform:suse] -redis [platform:rpm] -redis-server [platform:dpkg] -dev-db/redis [platform:gentoo] rrdtool-devel [platform:rpm] ruby [platform:ubuntu] dev-lang/ruby [platform:gentoo] @@ -130,4 +118,3 @@ zip zlib-devel [platform:rpm] zlib1g-dev [platform:dpkg] sys-libs/zlib [platform:gentoo] -zookeeperd [platform:dpkg]