diff --git a/scripts/kash b/scripts/kash index 387556b2..f71ac023 160000 --- a/scripts/kash +++ b/scripts/kash @@ -1 +1 @@ -Subproject commit 387556b287866cc44fcdd4fd8d27f9bdfb45549a +Subproject commit f71ac023d01f32a146eede6126cf596790a82163 diff --git a/scripts/run_e2e_test.sh b/scripts/run_e2e_test.sh index 7d4b10f2..ab2dcfd1 100644 --- a/scripts/run_e2e_test.sh +++ b/scripts/run_e2e_test.sh @@ -4,7 +4,9 @@ set -euo pipefail APP=$1 SLACK_WEBHOOK=$2 -LINK="" + +GOOGLE_LOGS_LINK="" +GOOGLE_SCREEN_LINK="" CURRENT_DATE=$(date +"%d-%m-%Y") @@ -17,13 +19,13 @@ ROOT_DIR=$(dirname "$THIS_DIR") ## Report outcome to slack ## -trap 'slack_e2e_report "$APP" "$?" "$SLACK_WEBHOOK" "$LINK"' EXIT +trap 'slack_e2e_report "$APP" "$?" "$SLACK_WEBHOOK" "$GOOGLE_LOGS_LINK" "$GOOGLE_SCREEN_LINK"' EXIT ## Run tests & redirect output to a log file ## mkdir -p "$ROOT_DIR/test/run/chrome" -yarn test:client > "$ROOT_DIR/test/run/chrome/e2e_test_log.txt" 2>&1 +yarn test:client > "$ROOT_DIR/test/run/chrome/google_logs.txt" 2>&1 # PUPPETEER_PRODUCT=firefox yarn add puppeteer # yarn link "@kalisio/kdk" --link-folder /opt/kalisio/yarn-links @@ -35,7 +37,10 @@ yarn test:client > "$ROOT_DIR/test/run/chrome/e2e_test_log.txt" 2>&1 ## cd "$ROOT_DIR/test" -zip -r "$ROOT_DIR/test/$CURRENT_DATE.zip" run +zip -r "$ROOT_DIR/test/screenshots_google.zip" run + +rclone copy "$ROOT_DIR/test/run/chrome/google_log.txt" "ovh-s3:/dev/e2e_tests/$APP/$CURRENT_DATE" +GOOGLE_LOGS_LINK=$(rclone link "ovh-s3:/dev/e2e_tests/$APP/$CURRENT_DATE/google_log.txt") -rclone copy "$ROOT_DIR/test/$CURRENT_DATE.zip" "ovh-s3:/dev/e2e_tests/$APP" -LINK=$(rclone link "ovh-s3:/dev/e2e_tests/$APP/$CURRENT_DATE.zip") \ No newline at end of file +rclone copy "$ROOT_DIR/test/screenshots_google.zip" "ovh-s3:/dev/e2e_tests/$APP/$CURRENT_DATE" +GOOGLE_SCREEN_LINK=$(rclone link "ovh-s3:/dev/e2e_tests/$APP/$CURRENT_DATE/screenshots_google.zip") \ No newline at end of file