From 8e375f23c88930a3c338c2dae8afafd7254e8381 Mon Sep 17 00:00:00 2001
From: ABC <abc@openwall.com>
Date: Wed, 15 May 2019 19:15:46 +0300
Subject: [PATCH] Fix Travis-CI tests.

---
 .travis.yml                                   | 36 +++++++++----------
 ...{Dockerfile.centos-6 => Dockerfile.centos} |  6 +++-
 travis/Dockerfile.centos-7                    | 13 -------
 3 files changed, 21 insertions(+), 34 deletions(-)
 rename travis/{Dockerfile.centos-6 => Dockerfile.centos} (71%)
 delete mode 100644 travis/Dockerfile.centos-7

diff --git a/.travis.yml b/.travis.yml
index f3b25b8..ad4ee01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,38 +21,34 @@ matrix:
       os: linux
     - name: ppc64le Ubuntu 16.04.4 LTS Xenial
       os: linux-ppc64le
-    - name: x86_64 CentOS 7.1810
-      OS_NAME: centos
-      OS_VERSION: 7.1810
-    - name: x86_64 CentOS 7.1708
-      OS_NAME: centos
-      OS_VERSION: 7.1708
-    - name: x86_64 CentOS 7.1611
-      OS_NAME: centos
-      OS_VERSION: 7.1611
+    - name: x86_64 CentOS 7.6.1810
+      env: OS_NAME=centos OS_VERSION=7.6.1810
+    - name: x86_64 CentOS 7.4.1708
+      env: OS_NAME=centos OS_VERSION=7.4.1708
+    - name: x86_64 CentOS 7.3.1611
+      env: OS_NAME=centos OS_VERSION=7.3.1611
     - name: x86_64 CentOS 6.10
-      OS_NAME: centos
-      OS_VERSION: 6.10
+      env: OS_NAME=centos OS_VERSION=6.10
     - name: x86_64 CentOS 6.9
-      OS_NAME: centos
-      OS_VERSION: 6.9
+      env: OS_NAME=centos OS_VERSION=6.9
     - name: x86_64 CentOS 6.8
-      OS_NAME: centos
-      OS_VERSION: 6.8
+      env: OS_NAME=centos OS_VERSION=6.8
 
 
 install:
   - if [ -z "$OS_NAME" ]; then
-      sudo m-a prepare;
+      ( set -x; sudo m-a prepare );
     else
-      sudo docker pull ${OS_NAME}:${OS_VERSION};
-      sudo docker build --no-cache --rm --file=travis/Dockerfile.${OS_NAME}-${OS_VERSION} --tag=${OS_NAME}-${OS_VERSION}:test .;
+      ( set -x;
+        sudo docker pull ${OS_NAME}:${OS_VERSION};
+        sudo docker build --no-cache --rm --file=travis/Dockerfile.${OS_NAME} --build-arg=OS_VERSION=${OS_VERSION} --tag=${OS_NAME}-${OS_VERSION}:test .;
+      );
     fi
 
 script:
   - if [ -z "$OS_NAME" ]; then
-      ./configure && make all && sudo make install;
+      ( set -x; ./configure && make all && sudo make install );
     else
-      sudo docker run -v $PWD:$PWD -w $PWD ${OS_NAME}-${OS_VERSION}:test;
+      ( set -x; sudo docker run -v $PWD:$PWD -w $PWD ${OS_NAME}-${OS_VERSION}:test );
     fi
 
diff --git a/travis/Dockerfile.centos-6 b/travis/Dockerfile.centos
similarity index 71%
rename from travis/Dockerfile.centos-6
rename to travis/Dockerfile.centos
index 4d4dda6..9f9a961 100644
--- a/travis/Dockerfile.centos-6
+++ b/travis/Dockerfile.centos
@@ -1,4 +1,8 @@
-FROM centos:6
+# https://hub.docker.com/_/centos/
+
+ARG OS_VERSION
+
+FROM centos:$OS_VERSION
 
 RUN yum -y install \
     gcc \
diff --git a/travis/Dockerfile.centos-7 b/travis/Dockerfile.centos-7
deleted file mode 100644
index 25cbb61..0000000
--- a/travis/Dockerfile.centos-7
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM centos:7
-
-RUN yum -y install \
-    gcc \
-    make \
-    kernel-devel \
-    iptables-devel \
-    net-snmp \
-    net-snmp-devel \
-    which
-
-CMD ./configure --kdir=$(echo /usr/src/kernels/*) && make all
-