Skip to content

Odeimaiz feature/export group #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 13, 2020
Merged

Odeimaiz feature/export group #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c27b5f6
Adds e2e outputs to ignore list
Mar 13, 2020
f63bfac
Fixes typo in LOG_LEVEL environ
Mar 13, 2020
816cf5e
Adds stack config to artifacts
Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ci/github/system-testing/e2e.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ install() {
echo "--------------- getting simcore docker images..."
make pull-version || ( (make pull-cache || true) && make build tag-version)
make info-images

# configure simcore for testing with a private registry
bash tests/e2e/setup_env_insecure_registry
# start simcore

# start simcore and set log-level to debug
export LOG_LEVEL=DEBUG; make up-version

echo "-------------- installing test framework..."
Expand Down Expand Up @@ -53,6 +55,9 @@ recover_artifacts() {
(docker service logs --timestamps simcore_storage > simcore_logs/storage.log) || true
(docker service logs --timestamps simcore_sidecar > simcore_logs/sidecar.log) || true
(docker service logs --timestamps simcore_catalog > simcore_logs/catalog.log) || true

# stack config
(cp .stack-simcore-version.yml simcore_logs/) || true
}

clean_up() {
Expand Down
8 changes: 4 additions & 4 deletions services/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- POSTGRES_HOST=${POSTGRES_HOST}
- POSTGRES_PORT=${POSTGRES_PORT}
- TESTING=false
- LOGLEVEL=${LOGLEVEL:-WARNING}
- LOGLEVEL=${LOG_LEVEL:-WARNING}
depends_on:
- postgres
networks:
Expand Down Expand Up @@ -64,7 +64,7 @@ services:
- STORAGE_PORT=8080
- SWARM_STACK_NAME=${SWARM_STACK_NAME:-simcore}
- WEBSERVER_MONITORING_ENABLED=1
- WEBSERVER_LOGLEVEL=${LOGLEVEL:-WARNING}
- WEBSERVER_LOGLEVEL=${LOG_LEVEL:-WARNING}
env_file:
- ../.env
depends_on:
Expand Down Expand Up @@ -118,7 +118,7 @@ services:
- REGISTRY_USER=${REGISTRY_USER}
- REGISTRY_PW=${REGISTRY_PW}
- SWARM_STACK_NAME=${SWARM_STACK_NAME:-simcore}
- SIDECAR_LOGLEVEL=${LOGLEVEL:-WARNING}
- SIDECAR_LOGLEVEL=${LOG_LEVEL:-WARNING}
depends_on:
- rabbit
- postgres
Expand All @@ -135,7 +135,7 @@ services:
- POSTGRES_DB=${POSTGRES_DB}
- POSTGRES_HOST=${POSTGRES_HOST}
- POSTGRES_PORT=${POSTGRES_PORT}
- STORAGE_LOGLEVEL=${LOGLEVEL:-WARNING}
- STORAGE_LOGLEVEL=${LOG_LEVEL:-WARNING}
- STORAGE_MONITORING_ENABLED=1
- S3_ENDPOINT=${S3_ENDPOINT}
- S3_ACCESS_KEY=${S3_ACCESS_KEY}
Expand Down
2 changes: 2 additions & 0 deletions tests/e2e/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
coverage
screenshots