From bcd79ce4a6382d250b6e955a024cc98e3a3ebfbe Mon Sep 17 00:00:00 2001 From: Denis Makogon Date: Fri, 21 Jul 2017 19:53:05 +0300 Subject: [PATCH] Enable integration tests in CI --- .gitlab-ci.yml | 2 +- Makefile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec75e28e2..aa26c6537 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,7 @@ integration_tests: - go build -o functions-alpine - docker build -t funcy/functions:latest . # - make docker-test-run-with-bolt - - make docker-test-run-with-sqlite3 + - DOCKER_LOCATION=container_ip make docker-test-run-with-sqlite3 # - make docker-test-run-with-postgres # - make docker-test-run-with-redis diff --git a/Makefile b/Makefile index 410057a4b..dc632f348 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,7 @@ docker-test-run-with-postgres: ./api_test.sh postgres ci-docker-test-run-with-sqlite3: + cd ${CURDIR}/test/fn-api-tests/ && docker build -t funcy/fn-api-tester .; cd ${CURDIR} docker run --rm -i -v ${CURDIR}:/go/src/gitlab-odx.oracle.com/odx/functions -w /go/src/gitlab-odx.oracle.com/odx/functions -e "datastore=sqlite3" funcy/fn-api-tester docker-test: