diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c02b3036672d481390b6894449606cc4c3265a20..e42b2f882003b80a5b413b3ff1d7de258c37969b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,21 +3,18 @@ image: node:6.12.2 services: - postgres:latest - - name: "marula.c3sl.ufpr.br:5000/c3sl/monetdb-ci-service:latest" + name: "dockerregistry.c3sl.ufpr.br:5000/c3sl/monetdb-ci-service:latest" alias: "monet" variables: POSTGRES_DB: 'blendb_fixture' POSTGRES_USER: 'runner' POSTGRES_PASSWORD: '' + MONETDB_NAME: 'blendb_fixture' PKG_VERSION: 'latest' DOCKER_URL: 'marula.c3sl.ufpr.br:5000/c3sl/blendb:' -# script: - # - docker exec -it monetdb bash -c "echo 'user=monetdb' > /.monetdb" > /dev/null - # - docker exec -it monetdb bash -c "echo 'password=monetdb' > /.monetdb" > /dev/null - -cache: +cache: paths: - node_modules diff --git a/config/ci_test.env.example b/config/ci_test.env.example index 9f6fffce6d7b22cb09e8ccfe92ac1ca8235cf6da..a0d7e2e5420b8335f68d14b0d27e6081c7717492 100644 --- a/config/ci_test.env.example +++ b/config/ci_test.env.example @@ -1,14 +1,14 @@ PORT=3000 -BLENDB_N_DB=1 -BLENDB_DB0_USER=postgres -BLENDB_DB0_NAME=postgres -BLENDB_DB0_PASSWORD=mysecretpassword -BLENDB_DB0_HOST=localhost +BLENDB_N_DB=2 +BLENDB_DB0_USER=runner +BLENDB_DB0_NAME=blendb_fixture +BLENDB_DB0_PASSWORD= +BLENDB_DB0_HOST=postgres BLENDB_DB0_PORT=5432 BLENDB_DB0_ADAPTER=postgres BLENDB_DB1_USER=monetdb -BLENDB_DB1_NAME=monetdb +BLENDB_DB1_NAME=blendb_fixture BLENDB_DB1_PASSWORD=monetdb -BLENDB_DB1_HOST=monetdb-monetdb +BLENDB_DB1_HOST=monet BLENDB_DB1_PORT=50000 BLENDB_DB1_ADAPTER=monet \ No newline at end of file