Skip to content
Snippets Groups Projects
Commit 9851e7d5 authored by rafaelatc3sl's avatar rafaelatc3sl
Browse files

Issue #102: Fix files witch ci doesn't cover


Signed-off-by: default avatarrafaelatc3sl <rpd17@c3sl>
parent 7d18c3dd
No related branches found
No related tags found
1 merge request!84Issue #102: Update auxiliar scripts to use new configuration file
...@@ -28,7 +28,7 @@ run_test: ...@@ -28,7 +28,7 @@ run_test:
stage: test stage: test
script: script:
- yarn install --frozen-lockfile --silent --non-interactive - yarn install --frozen-lockfile --silent --non-interactive
- mv config/ci_database_test.env.example config/test.env - mv config/test.env.example config/test.env
- yarn test - yarn test
- yarn run lint - yarn run lint
tags: tags:
...@@ -59,4 +59,3 @@ deploy: ...@@ -59,4 +59,3 @@ deploy:
- build - build
only: only:
- develop - develop
BLENDB_DB_NAME=blendb-test
BLENDB_DB_USER=blendb
BLENDB_DB_PASSWORD=secret
BLENDB_DB_HOST=localhost
BLENDB_DB_PORT=5432
BLENDB_ADAPTER=postgres
BLENDB_SCHEMA_FILE=config/config.yaml.example BLENDB_SCHEMA_FILE=config/config.yaml.example
PORT=3000 PORT=3000
BLENDB_N_DB=1
BLENDB_DB0_USER=blendb
BLENDB_DB0_NAME=blendb-test
BLENDB_DB0_PASSWORD=secret
BLENDB_DB0_HOST=localhost
BLENDB_DB0_PORT=5432
BLENDB_DB0_ADAPTER=postgres
File moved
[
{"met:seller:count:age" : 4, "dim:seller:status" : "active"},
{"met:seller:count:age" : 1, "dim:seller:status" : "sick leave"}
]
...@@ -12,18 +12,20 @@ services: ...@@ -12,18 +12,20 @@ services:
security_opt: security_opt:
- no-new-privileges - no-new-privileges
blendb: blendb:
image: marula.c3sl.ufpr.br:5000/c3sl/blendb:latest # image: marula.c3sl.ufpr.br:5000/c3sl/blendb:latest
image: blendb
build: . build: .
container_name: blendb container_name: blendb
environment: environment:
BLENDB_DB_USER: postgres
BLENDB_DB_PASSWORD: passwd
BLENDB_DB_NAME: postgres
BLENDB_DB_HOST: postgres
BLENDB_DB_PORT: 5432
BLENDB_ADAPTER: postgres
BLENDB_SCHEMA_FILE: config/config.yaml.example BLENDB_SCHEMA_FILE: config/config.yaml.example
PORT: 3000 PORT: 3000
BLENDB_N_DB: 1
BLENDB_DB0_USER: postgres
BLENDB_DB0_NAME: postgres
BLENDB_DB0_PASSWORD: passwd
BLENDB_DB0_HOST: postgres
BLENDB_DB0_PORT: 5432
BLENDB_DB0_ADAPTER: postgres
ports: ports:
- 3000:3000 - 3000:3000
command: ["yarn","test-mode"] command: ["yarn","test-mode"]
......
...@@ -37,7 +37,7 @@ else{ ...@@ -37,7 +37,7 @@ else{
} }
config = ConfigParser.parse(configPath); config = ConfigParser.parse(configPath);
fixture = new FixPostgres(config.connection); fixture = new FixPostgres(config.connections[0]);
fixture.load(config.loadViews, (err) => { fixture.load(config.loadViews, (err) => {
if (err) { if (err) {
......
...@@ -40,7 +40,7 @@ const config = ConfigParser.parse(configFile); ...@@ -40,7 +40,7 @@ const config = ConfigParser.parse(configFile);
const referencePath = path.dirname(configFile); const referencePath = path.dirname(configFile);
const engine = new Engine(config); const engine = new Engine(config);
const adapter = new PostgresAdapter(config.connection); const adapter = new PostgresAdapter(config.connections[0]);
let schema = ""; let schema = "";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment