From 6a9db5a1c95a61b65bd2e2aff544d14cd137a64e Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Thu, 15 Nov 2018 18:21:27 +0100
Subject: [PATCH] Produce multiple docker images

---
 .travis.yml | 90 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 66 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1bd6e17e888..a95fc28c401 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,23 @@
+language: python # This lets us use newer python versions from virtualenv
+python: "3.5"
+compiler: clang
+dist: trusty
+sudo: false
+cache:
+  apt: true
+  pip: true
+  directories:
+    - $HOME/.ccache
+  timeout: 1000
+
 matrix:
   fast_finish: true
   include:
-    # QT5 based build with Python 3 // using container based builds and prebuild binary dependencies in osgeo4travis
+      ##########################################################
+      # QGIS TESTS ON BIONIC
+      ##########################################################
     - os: linux
       services: docker
-      language: python # This lets us use newer python versions from virtualenv
       env:
         - TRAVIS_CONFIG=linux
         - DOCKER_COMPOSE=${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml
@@ -12,31 +25,14 @@ matrix:
         - DOCKER_TAG=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && echo $TRAVIS_BRANCH | sed 's/master/latest/' || echo "latest" )
         - TRAVIS_TIMESTAMP=$(date +%s)
         - CCACHE_DIR=${HOME}/.ccache
-      dist: trusty
-      sudo: false
-      cache:
-        apt: true
-        pip: true
-        directories:
-          - $HOME/.ccache
-        timeout: 1000
-      compiler: clang
-      python: "3.5"
-      addons:
-        apt:
-          sources:
-          packages:
+      if: type!=cron
 
-
-    - os: linux
-      language: python
-      python: "3.5"
+      ##########################################################
+      # CODE LAYOUT
+      ##########################################################
+    
       env:
         - TRAVIS_CONFIG=code_layout
-      dist: trusty
-      sudo: false
-      cache:
-        apt: true
       addons:
         apt:
           sources:
@@ -69,6 +65,52 @@ matrix:
             - libstrictures-perl
             - libstring-escape-perl
             - libtry-tiny-perl
+
+
+
+      ##########################################################
+      #
+      #  DOCKER IMAGE BUILD JOBS ON CRON
+      #
+      ##########################################################
+
+
+
+
+
+      ##########################################################
+      # BIONIC DOCKER BUILD ON CRON
+      ##########################################################
+    - os: linux
+      services: docker
+      env:
+        - TRAVIS_CONFIG=linux
+        - DOCKER_COMPOSE=${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml
+        # TRAVIS_BRANCH is either the git tag or the branch name when no tag
+        - DOCKER_TAG=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && echo $TRAVIS_BRANCH | sed 's/master/latest/' || echo "latest" )
+        - TRAVIS_TIMESTAMP=$(date +%s)
+        - CCACHE_DIR=${HOME}/.ccache
+        - DOCKER_DEBIAN_DISTRO=bionic
+      if: type=cron
+
+      ##########################################################
+      # COSMIC DOCKER BUILD ON CRON
+      ##########################################################
+    - os: linux
+      services: docker
+      env:
+        - TRAVIS_CONFIG=linux
+        - DOCKER_COMPOSE=${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml
+        # TRAVIS_BRANCH is either the git tag or the branch name when no tag
+        - DOCKER_TAG=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && echo $TRAVIS_BRANCH | sed 's/master/latest/' || echo "latest" )
+        - TRAVIS_TIMESTAMP=$(date +%s)
+        - CCACHE_DIR=${HOME}/.ccache
+        - DOCKER_DEBIAN_DISTRO=cosmic
+      if: type=cron
+
+
+
+
     # OSX based build with QT4 and Python 2
 #    - os: osx
 #      osx_image: xcode8.3 # MacOS 10.12: Sierra