[travis] Move to single test script and use travis job matrix

Move all the sosreport runs to a simple bash script:
tests/simple.sh so it can be called multiple times.
This also makes it possible to run locally.

The travis job matrix let's us have 2 Ubuntu native sos
runs against installed python, while letting us to also
continue to do the old style python runs.  Ideally,
we can utilize this to do Fedora/CentOS/RHEL jobs in the
future.

Python 3.4 testing was also dropped - as it seems to not
be as well used (many test failures due to not being available).
Python 3.8 testing was added.
pycodestyle will only run once with the bionic version.

Resolves: #1896

Signed-off-by: Bryan Quigley <bryan.quigley@canonical.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>

1 files changed, 61 insertions, 28 deletions

diff --git a/.travis.yml b/.travis.yml
index 86f5168b..6d7912c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,64 @@
-language: python
-python:
-  - "2.7"
-  - "3.4"
-  - "3.5"
-  - "3.6"
-  - "3.7"
-  - "nightly"
-matrix:
-  allow_failures:
-    - python: "nightly"
+jobs:
+  include:
+    - name: "18.04 pycodestyle and native run (py3.6)"
+      os: linux
+      dist: bionic
+      language: shell
+      install: sudo apt-get update; sudo apt install pycodestyle;
+      script:
+        - "pycodestyle sos"
+        - "sudo ./tests/simple.sh"
+    - name: "16.04 native run (py3.5)"
+      os: linux
+      dist: xenial
+      language: shell
+      script: "sudo ./tests/simple.sh"
+    - name: "nosetests and travis Python 2.7"
+      os: linux
+      dist: bionic
+      language: python
+      python: "2.7"
+      install: pip install -r requirements.txt; python setup.py install;
+      script:
+        - "nosetests -v --with-cover --cover-package=sos --cover-html"
+        - "sudo ./tests/simple.sh ~/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/python"
+    - name: "nosetests and travis Python 3.5"
+      os: linux
+      dist: bionic
+      language: python
+      python: "3.5"
+      install: pip install -r requirements.txt; python setup.py install;
+      script:
+        - "nosetests -v --with-cover --cover-package=sos --cover-html"
+        - "sudo ./tests/simple.sh ~/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/python"
+    - name: "nosetests and travis Python 3.6"
+      os: linux
+      dist: bionic
+      language: python
+      python: "3.6"
+      install: pip install -r requirements.txt; python setup.py install;
+      script:
+        - "nosetests -v --with-cover --cover-package=sos --cover-html"
+        - "sudo ./tests/simple.sh ~/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/python"
+    - name: "nosetests and travis Python 3.7"
+      os: linux
+      dist: bionic
+      language: python
+      python: "3.7"
+      install: pip install -r requirements.txt; python setup.py install;
+      script:
+        - "nosetests -v --with-cover --cover-package=sos --cover-html"
+        - "sudo ./tests/simple.sh ~/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/python"
+    - name: "nosetests and travis Python 3.8"
+      os: linux
+      dist: bionic
+      language: python
+      python: "3.8"
+      install: pip install -r requirements.txt; python setup.py install;
+      script:
+        - "nosetests -v --with-cover --cover-package=sos --cover-html"
+        - "sudo ./tests/simple.sh ~/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/python"
+
 notifications:
   email:
     sos-devel@redhat.com
@@ -16,22 +66,5 @@ notifications:
     channels:
       - "us.freenode.net#sosreport"
     on_success: change
-dist: xenial
-install:
-  - "pip install -r requirements.txt"
-  - "python setup.py install"
-script:
-  - "pycodestyle sos"
-  - "pycodestyle --version"
-  - "nosetests -v --with-cover --cover-package=sos --cover-html"
-  - "sudo ~/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/python ./sosreport --help"
-  - "sudo ~/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/python ./sosreport -l --config-file=sos.conf"
-  - "sudo ~/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/python ./sosreport --batch --config-file=sos.conf 2> errors | tee batch_output"
-  - "sudo ~/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/python ./sosreport --batch --all-logs --config-file=sos.conf 2> errors | tee batch_output"
-  - "sudo ~/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/python ./sosreport --batch --since=20191007 --config-file=sos.conf 2> errors | tee batch_output"
-  - "sudo ~/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/python ./sosreport --batch --all-logs --since=20191007 --config-file=sos.conf 2> errors | tee batch_output"
-  - "[[ ! -s errors ]]"
-  - "cat errors"
-  - "sudo ~/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/python ./sosreport --batch --build --config-file=sos.conf"
 git:
   depth: 5