diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a69226a5cb0a198bb3b2c8be1b5cb545b7b41071..776351873ced31a3354cd264519e3ae1108de8ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,13 +2,17 @@ image: node:6.12.2 services: - postgres: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:' + DOCKER_URL: 'dockerregistry.c3sl.ufpr.br:5000/c3sl/blendb:' cache: paths: @@ -20,18 +24,29 @@ stages: - deploy -run_tests: +run_test_postgres: stage: test - before_script: + script: - yarn install --frozen-lockfile --silent --non-interactive - script: - mv config/ci_test.yaml.example config/test.yaml - - mv config/ci_test.env.example config/test.env + - mv config/ci_postgres_test.env.example config/test.env - yarn test - yarn run lint tags: - node - postgres + +run_test_monet: + stage: test + script: + - yarn install --frozen-lockfile --silent --non-interactive + - mv config/ci_test.yaml.example config/test.yaml + - mv config/ci_monet_test.env.example config/test.env + - yarn test + - yarn run lint + tags: + - node + build: stage: build variables: diff --git a/config/ci_monet_test.env.example b/config/ci_monet_test.env.example new file mode 100644 index 0000000000000000000000000000000000000000..2bec39d961d1f519f555b03c250283976fdc5a3b --- /dev/null +++ b/config/ci_monet_test.env.example @@ -0,0 +1,7 @@ +BLENDB_DB_USER=monetdb +BLENDB_DB_NAME=blendb_fixture +BLENDB_DB_PASSWORD=monetdb +BLENDB_DB_HOST=monet +BLENDB_DB_PORT=50000 +BLENDB_ADAPTER=monet +PORT=3000 diff --git a/config/ci_test.env.example b/config/ci_postgres_test.env.example similarity index 100% rename from config/ci_test.env.example rename to config/ci_postgres_test.env.example