From cf0082478d6dfa2d7f42df52bb2a2c6de9ebb333 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Fri, 26 Oct 2018 10:39:35 +0800
Subject: run docker builds in travis instead of jenkins (#4526)

* docker experiment in travis

* let's run 'em all

* okay run as travis

* fine just use a number

* remove xenial since we test that elsewhere

* suspicion

* review feedback

* more comments

* use workdir

* heavy sigh
---
 .travis/install.sh         |  8 ++++++++
 .travis/run.sh             | 11 ++++++++++-
 .travis/upload_coverage.sh |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

(limited to '.travis')

diff --git a/.travis/install.sh b/.travis/install.sh
index 20a88312..def7343b 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -46,6 +46,14 @@ elif [ -n "${LIBRESSL}" ]; then
     fi
 fi
 
+if [ -n "${DOCKER}" ]; then
+    if [ -n "${OPENSSL}" ] || [ -n "${LIBRESSL}" ]; then
+        echo "OPENSSL and LIBRESSL are not allowed when DOCKER is set."
+        exit 1
+    fi
+    docker pull "$DOCKER"
+fi
+
 if [ -z "${DOWNSTREAM}" ]; then
     git clone --depth=1 https://github.com/google/wycheproof "$HOME/wycheproof"
 fi
diff --git a/.travis/run.sh b/.travis/run.sh
index 5e0e56df..8f8dd687 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -22,7 +22,16 @@ fi
 
 source ~/.venv/bin/activate
 
-if [ -n "${TOXENV}" ]; then
+if [ -n "${DOCKER}" ]; then
+    # We will be able to drop the -u once we switch the default container user in the
+    # dockerfiles.
+    docker run --rm -u 2000:2000 \
+        -v "${TRAVIS_BUILD_DIR}":"${TRAVIS_BUILD_DIR}" \
+        -v "${HOME}/wycheproof":/wycheproof \
+        -w "${TRAVIS_BUILD_DIR}" \
+        -e TOXENV "${DOCKER}" \
+        /bin/sh -c "tox -- --wycheproof-root='/wycheproof'"
+elif [ -n "${TOXENV}" ]; then
     tox -- --wycheproof-root="$HOME/wycheproof"
 else
     downstream_script="${TRAVIS_BUILD_DIR}/.travis/downstream.d/${DOWNSTREAM}.sh"
diff --git a/.travis/upload_coverage.sh b/.travis/upload_coverage.sh
index e960907e..2f2cb3c1 100755
--- a/.travis/upload_coverage.sh
+++ b/.travis/upload_coverage.sh
@@ -11,7 +11,7 @@ if [ -n "${TOXENV}" ]; then
         docs);;
         *)
             source ~/.venv/bin/activate
-            codecov --env TRAVIS_OS_NAME,TOXENV,OPENSSL
+            codecov --env TRAVIS_OS_NAME,TOXENV,OPENSSL,DOCKER
             ;;
     esac
 fi
-- 
cgit v1.2.3