update test environment (Docker etc)

Author: funbringer

.dockerignore

@@ -0,0 +1,5 @@
+*.gcno
+*.gcda
+*.gcov
+*.so
+*.o

.travis.yml

@@ -1,27 +1,31 @@
-os:
-    - linux
-
 sudo: required
-dist: trusty
 
 language: c
 
 services:
     - docker
 
 install:
-    - echo "FROM ${DOCKER_IMAGE}" > Dockerfile
+    - ./mk_dockerfile.sh
     - docker-compose build
 
 script:
     - docker-compose run $(bash <(curl -s https://codecov.io/env)) tests
 
+notifications:
+    email:
+        on_success: change
+        on_failure: always
+
 env:
-    - DOCKER_IMAGE=pathman/pg95_clang_check_code
-    - DOCKER_IMAGE=pathman/pg95_pathman_tests
-    - DOCKER_IMAGE=pathman/pg96_clang_check_code
-    - DOCKER_IMAGE=pathman/pg96_pathman_tests
-    - DOCKER_IMAGE=pathman/pg10_clang_check_code
-    - DOCKER_IMAGE=pathman/pg10_pathman_tests
-    - DOCKER_IMAGE=pathman/pg10_ca_clang_check_code
-    - DOCKER_IMAGE=pathman/pg10_ca_pathman_tests
+    - PG_VERSION=10 LEVEL=nightmare
+    - PG_VERSION=10 LEVEL=hardcore
+    - PG_VERSION=10
+    - PG_VERSION=9.6 LEVEL=hardcore
+    - PG_VERSION=9.6
+    - PG_VERSION=9.5 LEVEL=hardcore
+    - PG_VERSION=9.5
+
+matrix:
+    allow_failures:
+        - env: PG_VERSION=10 LEVEL=nightmare

Dockerfile.tmpl

@@ -1,30 +1,40 @@
-FROM ${PG_IMAGE}
+FROM postgres:${PG_VERSION}-alpine
 
-ENV LANG=C.UTF-8 PGDATA=/pg/data
+# Install dependencies
+RUN apk add --no-cache \
+	openssl curl \
+	cmocka-dev \
+	perl perl-ipc-run \
+	python3 python3-dev py-virtualenv \
+	coreutils linux-headers \
+	make musl-dev gcc bison flex \
+	zlib-dev libedit-dev \
+	clang clang-analyzer;
+
+# Install fresh valgrind
+RUN apk add valgrind \
+	--update-cache \
+	--repository http://dl-3.alpinelinux.org/alpine/edge/main;
 
-RUN if [ "${CHECK_CODE}" = "clang" ] ; then \
-	echo 'http://dl-3.alpinelinux.org/alpine/edge/main' > /etc/apk/repositories; \
-	apk --no-cache add clang-analyzer make musl-dev gcc; \
-	fi
+# Environment
+ENV LANG=C.UTF-8 PGDATA=/pg/data
 
-RUN if [ "${CHECK_CODE}" = "cppcheck" ] ; then \
-	apk --no-cache add cppcheck --repository http://dl-cdn.alpinelinux.org/alpine/v3.6/community; \
-	fi
+# Make directories
+RUN	mkdir -p ${PGDATA} && \
+	mkdir -p /pg/testdir
 
-RUN if [ "${CHECK_CODE}" = "false" ] ; then \
-	echo 'http://dl-3.alpinelinux.org/alpine/edge/main' > /etc/apk/repositories; \
-	apk --no-cache add curl python3 python3-dev gcc make musl-dev cmocka-dev linux-headers;\
-	pip3 install virtualenv;\
-	fi
+# Add data to test dir
+ADD . /pg/testdir
 
-RUN mkdir -p /pg/data && \
-	mkdir /pg/pg_pathman && \
-	chown postgres:postgres ${PGDATA} && \
+# Grant privileges
+RUN	chown -R postgres:postgres ${PGDATA} && \
+	chown -R postgres:postgres /pg/testdir && \
 	chmod a+rwx /usr/local/lib/postgresql && \
 	chmod a+rwx /usr/local/share/postgresql/extension
 
-ONBUILD ADD . /pg/pg_pathman
-ONBUILD WORKDIR /pg/pg_pathman
-ONBUILD RUN chmod -R go+rwX /pg/pg_pathman
-ONBUILD USER postgres
-ONBUILD ENTRYPOINT PGDATA=${PGDATA} CHECK_CODE=${CHECK_CODE} bash run_tests.sh
+COPY run_tests.sh /run.sh
+RUN chmod 755 /run.sh
+
+USER postgres
+WORKDIR /pg/testdir
+ENTRYPOINT LEVEL=${LEVEL} /run.sh

make_images.py

@@ -0,0 +1,16 @@
+if [ -z ${PG_VERSION+x} ]; then
+	echo PG_VERSION is not set!
+	exit 1
+fi
+
+if [ -z ${LEVEL+x} ]; then
+	LEVEL=scan-build
+fi
+
+echo PG_VERSION=${PG_VERSION}
+echo LEVEL=${LEVEL}
+
+sed \
+	-e 's/${PG_VERSION}/'${PG_VERSION}/g \
+	-e 's/${LEVEL}/'${LEVEL}/g \
+	Dockerfile.tmpl > Dockerfile