]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
install-deps.sh: add support for Ubuntu Disco Dingo
authorPatrick Seidensal <pseidensal@suse.com>
Mon, 16 Sep 2019 12:28:06 +0000 (14:28 +0200)
committerPatrick Seidensal <pseidensal@suse.com>
Tue, 17 Sep 2019 06:35:34 +0000 (08:35 +0200)
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
debian/control
install-deps.sh

index ee63e0c63484daa1027a515954c095396425fff8..0094c9b4274ff3cc7e2cdf1be768950deeb34c74 100644 (file)
@@ -74,7 +74,7 @@ Build-Depends: cmake (>= 3.5),
 # Make-Check   python-pecan,
 # Make-Check   python-bcrypt,
 # Make-Check   python-six,
-# Make-Check   python-tox,
+# Make-Check   python-tox | tox,
 # Make-Check   python-coverage,
 # Make-Check   python-openssl,
 # Make-Check   python-prettytable,
index 23b6e2f97ab799a3455ec007b7bcffd82fd78f27..20feccda3424adf4f27a468105f88641fe0a5a6a 100755 (executable)
@@ -314,6 +314,9 @@ else
                 ensure_decent_gcc_on_ubuntu 9 bionic
                 [ ! $NO_BOOST_PKGS ] && install_boost_on_ubuntu bionic
                 ;;
+            *Disco*)
+                [ ! $NO_BOOST_PKGS ] && apt-get install -y libboost1.67-all-dev
+                ;;
             *)
                 $SUDO apt-get install -y gcc
                 ;;