Skip to content

Commit 3c7c5c1

Browse files
authored
Merge pull request #59 from pcrespov/odeimaiz-feature/export-group
Odeimaiz feature/export group
2 parents 7733d83 + 816cf5e commit 3c7c5c1

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

ci/github/system-testing/e2e.bash

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ install() {
1414
echo "--------------- getting simcore docker images..."
1515
make pull-version || ( (make pull-cache || true) && make build tag-version)
1616
make info-images
17+
1718
# configure simcore for testing with a private registry
1819
bash tests/e2e/setup_env_insecure_registry
19-
# start simcore
20+
21+
# start simcore and set log-level to debug
2022
export LOG_LEVEL=DEBUG; make up-version
2123

2224
echo "-------------- installing test framework..."
@@ -53,6 +55,9 @@ recover_artifacts() {
5355
(docker service logs --timestamps simcore_storage > simcore_logs/storage.log) || true
5456
(docker service logs --timestamps simcore_sidecar > simcore_logs/sidecar.log) || true
5557
(docker service logs --timestamps simcore_catalog > simcore_logs/catalog.log) || true
58+
59+
# stack config
60+
(cp .stack-simcore-version.yml simcore_logs/) || true
5661
}
5762

5863
clean_up() {

services/docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
- POSTGRES_HOST=${POSTGRES_HOST}
1111
- POSTGRES_PORT=${POSTGRES_PORT}
1212
- TESTING=false
13-
- LOGLEVEL=${LOGLEVEL:-WARNING}
13+
- LOGLEVEL=${LOG_LEVEL:-WARNING}
1414
depends_on:
1515
- postgres
1616
networks:
@@ -64,7 +64,7 @@ services:
6464
- STORAGE_PORT=8080
6565
- SWARM_STACK_NAME=${SWARM_STACK_NAME:-simcore}
6666
- WEBSERVER_MONITORING_ENABLED=1
67-
- WEBSERVER_LOGLEVEL=${LOGLEVEL:-WARNING}
67+
- WEBSERVER_LOGLEVEL=${LOG_LEVEL:-WARNING}
6868
env_file:
6969
- ../.env
7070
depends_on:
@@ -118,7 +118,7 @@ services:
118118
- REGISTRY_USER=${REGISTRY_USER}
119119
- REGISTRY_PW=${REGISTRY_PW}
120120
- SWARM_STACK_NAME=${SWARM_STACK_NAME:-simcore}
121-
- SIDECAR_LOGLEVEL=${LOGLEVEL:-WARNING}
121+
- SIDECAR_LOGLEVEL=${LOG_LEVEL:-WARNING}
122122
depends_on:
123123
- rabbit
124124
- postgres
@@ -135,7 +135,7 @@ services:
135135
- POSTGRES_DB=${POSTGRES_DB}
136136
- POSTGRES_HOST=${POSTGRES_HOST}
137137
- POSTGRES_PORT=${POSTGRES_PORT}
138-
- STORAGE_LOGLEVEL=${LOGLEVEL:-WARNING}
138+
- STORAGE_LOGLEVEL=${LOG_LEVEL:-WARNING}
139139
- STORAGE_MONITORING_ENABLED=1
140140
- S3_ENDPOINT=${S3_ENDPOINT}
141141
- S3_ACCESS_KEY=${S3_ACCESS_KEY}

tests/e2e/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
coverage
2+
screenshots

0 commit comments

Comments
 (0)