alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Change way env vars for tests are set

Browse Source
This commit is contained in:
James
2017-06-14 12:16:30 -07:00
parent b45ad6d5f9
commit 1523144ff9
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -49,7 +49,7 @@ build_job:
test_job: test_job:
stage: test stage: test
script: script:
- ./test.sh - DOCKER_LOCATION=container_ip ./test.sh
deploy_job: deploy_job:
only: only:

16
test.sh
View File

@@ -9,17 +9,18 @@ docker run --name func-mysql-test -p 3307:3306 -e MYSQL_DATABASE=funcs -e MYSQL_
docker rm -fv func-redis-test|| echo No prev redis test db container docker rm -fv func-redis-test|| echo No prev redis test db container
docker run --name func-redis-test -p 6301:6379 -d redis docker run --name func-redis-test -p 6301:6379 -d redis
sleep 5 sleep 5
if [ `uname` == "Darwin" ] case ${DOCKER_LOCATION-localhost} in
then docker_ip)
export POSTGRES_HOST=localhost export POSTGRES_HOST=${DOCKER_HOST-localhost}
export POSTGRES_PORT=15432 export POSTGRES_PORT=15432
export MYSQL_HOST=localhost export MYSQL_HOST=${DOCKER_HOST-localhost}
export MYSQL_PORT=3307 export MYSQL_PORT=3307
export REDIS_HOST=localhost export REDIS_HOST=${DOCKER_HOST-localhost}
export REDIS_PORT=6301 export REDIS_PORT=6301
else ;;
container_ip)
export POSTGRES_HOST="$(docker inspect -f '{{.NetworkSettings.IPAddress}}' func-postgres-test)" export POSTGRES_HOST="$(docker inspect -f '{{.NetworkSettings.IPAddress}}' func-postgres-test)"
export POSTGRES_PORT=5432 export POSTGRES_PORT=5432
@@ -28,7 +29,8 @@ else
export REDIS_HOST="$(docker inspect -f '{{.NetworkSettings.IPAddress}}' func-redis-test)" export REDIS_HOST="$(docker inspect -f '{{.NetworkSettings.IPAddress}}' func-redis-test)"
export REDIS_PORT=6379 export REDIS_PORT=6379
fi ;;
esac
go test -v $(go list ./... | grep -v vendor | grep -v examples | grep -v tool | grep -v fn) go test -v $(go list ./... | grep -v vendor | grep -v examples | grep -v tool | grep -v fn)
# go test -v gitlab-odx.oracle.com/odx/functions/api/runner/drivers/docker # go test -v gitlab-odx.oracle.com/odx/functions/api/runner/drivers/docker