Changes to Travis-CI configuration to use installation script (#832)

Author: joachimmetz

.travis.yml

@@ -10,28 +10,46 @@ matrix:
     node_js: '8'
     virtualenv:
       system_site_packages: true
-  - name: "Ubuntu Xenial (16.04) with Python 2.7"
+  - name: "Ubuntu Xenial (16.04) with Python 2.7 (pip)"
     env: TARGET="linux-python27"
     os: linux
     dist: xenial
     group: edge
     language: python
     python: 2.7
     node_js: '8'
-  - name: "Ubuntu Xenial (16.04) with Python 3.6"
+  - name: "Ubuntu Xenial (16.04) with Python 3.6 (pip)"
     env: TARGET="linux-python36"
     os: linux
     dist: xenial
     group: edge
     language: python
     python: 3.6
     node_js: '8'
+  - name: "Ubuntu Bionic (18.04) (Docker) with Python 2.7"
+    env: UBUNTU_VERSION="18.04"
+    os: linux
+    dist: xenial
+    sudo: required
+    group: edge
+    language: python
+    python: 2.7
+    services:
+    - docker
+  - name: "Ubuntu Bionic (18.04) (Docker) with Python 3.6"
+    env: UBUNTU_VERSION="18.04"
+    os: linux
+    dist: xenial
+    sudo: required
+    group: edge
+    language: python
+    python: 3.6
+    services:
+    - docker
 cache:
 - yarn
 - pip
 install:
 - ./config/travis/install.sh
-- pip install -r requirements.txt
-- yarn install
 script:
 - ./config/travis/run_with_timeout.sh 30 ./config/travis/runtests.sh

config/travis/install.sh

@@ -5,10 +5,49 @@
 # This file is generated by l2tdevtools update-dependencies.py any dependency
 # related changes should be made in dependencies.ini.
 
+DPKG_PYTHON2_DEPENDENCIES="python-alembic python-altair python-amqp python-aniso8601 python-asn1crypto python-attr python-bcrypt python-billiard python-blinker python-bs4 python-celery python-certifi python-cffi python-chardet python-click python-configparser python-cryptography python-datasketch python-dateutil python-editor python-elasticsearch python-elasticsearch5 python-entrypoints python-enum34 python-flask python-flask-bcrypt python-flask-login python-flask-migrate python-flask-restful python-flask-script python-flask-sqlalchemy python-flask-wtf python-gunicorn python-idna python-ipaddress python-itsdangerous python-jinja2 python-jsonschema python-jwt python-kombu python-mako python-markupsafe python-neo4jrestclient python-numpy python-pandas python-parameterized python-pycparser python-pyrsistent python-redis python-requests python-six python-sqlalchemy python-toolz python-typing python-tz python-urllib3 python-vine python-werkzeug python-wtforms python-yaml";
+
+DPKG_PYTHON2_TEST_DEPENDENCIES="python-coverage python-flask-testing python-funcsigs python-mock python-nose python-pbr";
+
+DPKG_PYTHON3_DEPENDENCIES="python3-alembic python3-altair python3-amqp python3-aniso8601 python3-asn1crypto python3-attr python3-bcrypt python3-billiard python3-blinker python3-bs4 python3-celery python3-certifi python3-cffi python3-chardet python3-click python3-cryptography python3-datasketch python3-dateutil python3-editor python3-elasticsearch python3-elasticsearch5 python3-entrypoints python3-flask python3-flask-bcrypt python3-flask-login python3-flask-migrate python3-flask-restful python3-flask-script python3-flask-sqlalchemy python3-flask-wtf python3-gunicorn python3-idna python3-ipaddress python3-itsdangerous python3-jinja2 python3-jsonschema python3-jwt python3-kombu python3-mako python3-markupsafe python3-neo4jrestclient python3-numpy python3-pandas python3-parameterized python3-pycparser python3-pyrsistent python3-redis python3-requests python3-six python3-sqlalchemy python3-toolz python3-tz python3-urllib3 python3-vine python3-werkzeug python3-wtforms python3-yaml";
+
+DPKG_PYTHON3_TEST_DEPENDENCIES="python3-flask-testing python3-mock python3-nose python3-pbr python3-setuptools";
+
 # Exit on error.
 set -e;
-if test ${TRAVIS_OS_NAME} = "linux" && test ${TARGET} != "jenkins";
+
+if test -n "${UBUNTU_VERSION}";
+then
+	CONTAINER_NAME="ubuntu${UBUNTU_VERSION}";
+
+	docker pull ubuntu:${UBUNTU_VERSION};
+
+	docker run --name=${CONTAINER_NAME} --detach -i ubuntu:${UBUNTU_VERSION};
+
+	docker exec ${CONTAINER_NAME} apt-get update -q;
+	docker exec ${CONTAINER_NAME} apt-get install -y software-properties-common;
+
+	docker exec ${CONTAINER_NAME} add-apt-repository universe -y;
+	docker exec ${CONTAINER_NAME} add-apt-repository ppa:gift/dev -y;
+
+	docker exec ${CONTAINER_NAME} apt-key adv --fetch-keys https://dl.yarnpkg.com/debian/pubkey.gpg;
+	docker exec ${CONTAINER_NAME} add-apt-repository "deb https://dl.yarnpkg.com/debian/ stable main";
+
+	if test ${TRAVIS_PYTHON_VERSION} = "2.7";
+	then
+		docker exec ${CONTAINER_NAME} sh -c "DEBIAN_FRONTEND=noninteractive apt-get install -y git yarn python ${DPKG_PYTHON2_DEPENDENCIES} ${DPKG_PYTHON2_TEST_DEPENDENCIES}";
+	else
+		docker exec ${CONTAINER_NAME} sh -c "DEBIAN_FRONTEND=noninteractive apt-get install -y git yarn python3 ${DPKG_PYTHON3_DEPENDENCIES} ${DPKG_PYTHON3_TEST_DEPENDENCIES}";
+	fi
+
+	docker cp ../timesketch ${CONTAINER_NAME}:/
+
+	docker exec ${CONTAINER_NAME} sh -c "cd timesketch && yarn install";
+
+elif test ${TRAVIS_OS_NAME} = "linux" && test ${TARGET} != "jenkins";
 then
+	pip install -r requirements.txt;
+
 	if test ${TARGET} = "pylint";
 	then
 		sudo add-apt-repository ppa:gift/pylint3 -y;
@@ -20,4 +59,5 @@ then
 	then
 		sudo apt-get install -y pylint;
 	fi
+	yarn install;
 fi

config/travis/runtests.sh

@@ -26,6 +26,17 @@ then
 		PYTHONPATH=api_client/python pylint --rcfile=.pylintrc ${FILE};
 	done
 
+elif test -n "${UBUNTU_VERSION}";
+then
+	CONTAINER_NAME="ubuntu${UBUNTU_VERSION}";
+
+	if test ${TRAVIS_PYTHON_VERSION} = "2.7";
+	then
+		docker exec ${CONTAINER_NAME} sh -c "export LANG=en_US.UTF-8; cd timesketch && nosetests";
+	else
+		docker exec ${CONTAINER_NAME} sh -c "export LANG=en_US.UTF-8; cd timesketch && nosetests3";
+	fi
+
 elif test "${TRAVIS_OS_NAME}" = "linux";
 then
 	python ./run_tests.py --full