antani

.travis.yml

@@ -87,7 +87,6 @@ matrix:
         sauce_connect: true
 
   allow_failures:
-    - env: GLTEST='build_and_install' BUILD_DISTRO='bionic'
     - env: GLTEST='end2end-0' BROWSER='edge 15'
     - env: GLTEST='end2end-1' BROWSER='ie 11'
     - env: GLTEST='end2end-2' BROWSER='firefox 34'

scripts/build_and_install.sh

@@ -3,10 +3,17 @@ set -e
 
 echo "Running Build & Install"
 distro="$(lsb_release -cs)"
-sudo apt-get update -y
-sudo apt-get install -y curl git debhelper devscripts dh-apparmor dh-python python python-pip python-setuptools python-sphinx
+sudo apt-get -y update
+
+sudo apt-get -y install curl git debhelper devscripts dh-apparmor dh-python python
+python-pip python-setuptools python-sphinx
+
+if [ $distro = "bionic" ]; then
+  sudo apt-get -y install python3-pip python3-setuptools python3-sphinx
+fi
+
 curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
-sudo apt-get install -y nodejs
+sudo apt-get -y install nodejs
 cd /build/GlobaLeaks
 sed -ie 's/key_bits = 2048/key_bits = 512/g' backend/globaleaks/settings.py
 sed -ie 's/csr_sign_bits = 512/csr_sign_bits = 256/g' backend/globaleaks/settings.py