ci: Configure docker/travis from travis.yml

This patch let's us configure the upstream mbedTLS version and the Python version used for testing explicitly from the travis.yml file.
Synss · Oct 16, 2020 · bed4222 · bed4222
1 parent 449fd44
commit bed4222
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,30 +16,31 @@ before_install:
   - docker pull $IMAGE:builder
   - >
     docker build
-      --target builder
-      --cache-from $IMAGE:builder
-      --tag $IMAGE:builder
-      --build-arg ARCH=$ARCH
-      .
+    --target builder
+    --cache-from $IMAGE:builder
+    --tag $IMAGE:builder
+    --build-arg ARCH=$ARCH
+    --build-arg MBEDTLS_VERSION=2.16.8
+    .
   - docker pull $IMAGE:latest
   - >
     docker build
-      --cache-from $IMAGE:builder
-      --cache-from $IMAGE:latest
-      --tag $IMAGE:$TRAVIS_BUILD_NUMBER
-      --tag $IMAGE:latest
-      --build-arg ARCH=$ARCH
-      .
+    --cache-from $IMAGE:builder
+    --cache-from $IMAGE:latest
+    --tag $IMAGE:$TRAVIS_BUILD_NUMBER
+    --tag $IMAGE:latest
+    --build-arg ARCH=$ARCH
+    .
   - >
     docker run
-      --rm
-      --interactive
-      --tty
-      --detach
-      --name $CONTAINER
-      --network=host
-      $IMAGE:latest
-      $PRE_CMD /bin/sh
+    --rm
+    --interactive
+    --tty
+    --detach
+    --name $CONTAINER
+    --network=host
+    $IMAGE:latest
+    $PRE_CMD /bin/sh
 
 install:
   - pip install -r requirements/travis.txt
@@ -55,13 +56,22 @@ script:
   - devpi upload wheelhouse/* sdist/*
   - devpi list python-mbedtls
   - >
-    docker exec
+    for tag in
+      "cp27-cp27m"
+      "cp27-cp27mu"
+      "cp35-cp35m"
+      "cp36-cp36m"
+      "cp37-cp37m"
+      "cp38-cp38"
+      "cp39-cp39";
+    do docker exec
       --interactive
       --tty
       --env PIP_INDEX_URL
       $CONTAINER
       $PRE_CMD /bin/sh -c
-      scripts/run-tests.sh
+      scripts/run-tests.sh $tag;
+    done
 
 after_script:
   - scripts/stop-devpi.sh

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
 ARG ARCH=x86_64
+ARG MBEDTLS_VERSION
 
 FROM quay.io/pypa/manylinux2010_${ARCH}:latest as base
 
@@ -8,7 +9,7 @@ RUN yum -y update \
     && yum -yq install cmake \
     && yum clean all
 COPY ./scripts/ ./scripts/
-RUN  ./scripts/download-mbedtls.sh 2.16.8 /usr/local/src \
+RUN  ./scripts/download-mbedtls.sh $MBEDTLS_VERSION /usr/local/src \
   && ./scripts/install-mbedtls.sh /usr/local/src /usr/local \
   && cp /usr/local/src/LICENSE LICENSE.mbedtls \
   && rm -r /usr/local/src

diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
@@ -2,14 +2,21 @@
 
 set -ex
 
-echo "Index: $PIP_INDEX_URL"
+if [ $# -ne 1 ]; then
+  cat <<- EOF
+
+  usage:
+    $0 PYTHON_TAG
 
-for pydir in /opt/python/*; do
-	$pydir/bin/python -m pip install -r requirements/tests.txt
-	$pydir/bin/python -m pip install \
-		--only-binary=:all: \
-		python-mbedtls
-	$pydir/bin/python -B -m pytest
-done
+  EOF
+  exit 1
+fi
+
+echo "Index: $PIP_INDEX_URL"
 
-/opt/python/*36*/bin/python -B -m doctest README.rst
+pydir="/opt/python/$1/"
+$pydir/bin/python -m pip install -r requirements/tests.txt
+$pydir/bin/python -m pip install \
+  --only-binary=:all: \
+  python-mbedtls
+$pydir/bin/python -B -m pytest