From c27b5f66f5bad3bbe2685d3cc9983bdcb78d4834 Mon Sep 17 00:00:00 2001 From: Pedro Crespo Date: Fri, 13 Mar 2020 10:34:19 +0100 Subject: [PATCH 1/3] Adds e2e outputs to ignore list --- tests/e2e/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 tests/e2e/.gitignore diff --git a/tests/e2e/.gitignore b/tests/e2e/.gitignore new file mode 100644 index 00000000000..d42d60c0f14 --- /dev/null +++ b/tests/e2e/.gitignore @@ -0,0 +1,2 @@ +coverage +screenshots From f63bfac2b0feb2d569f750bdda946f376010eafd Mon Sep 17 00:00:00 2001 From: Pedro Crespo Date: Fri, 13 Mar 2020 10:34:38 +0100 Subject: [PATCH 2/3] Fixes typo in LOG_LEVEL environ --- ci/github/system-testing/e2e.bash | 4 +++- services/docker-compose.yml | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ci/github/system-testing/e2e.bash b/ci/github/system-testing/e2e.bash index 9f4692f6c51..efdfb4195a0 100755 --- a/ci/github/system-testing/e2e.bash +++ b/ci/github/system-testing/e2e.bash @@ -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..." diff --git a/services/docker-compose.yml b/services/docker-compose.yml index eb238ec6d61..374e93c1478 100644 --- a/services/docker-compose.yml +++ b/services/docker-compose.yml @@ -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: @@ -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: @@ -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 @@ -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} From 816cf5e67014bbfea798ae63c7ba9ebb293986d7 Mon Sep 17 00:00:00 2001 From: Pedro Crespo Date: Fri, 13 Mar 2020 10:38:30 +0100 Subject: [PATCH 3/3] Adds stack config to artifacts --- ci/github/system-testing/e2e.bash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/github/system-testing/e2e.bash b/ci/github/system-testing/e2e.bash index efdfb4195a0..2ed37072434 100755 --- a/ci/github/system-testing/e2e.bash +++ b/ci/github/system-testing/e2e.bash @@ -55,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() {