diff --git a/ci/scripts/notify.py b/ci/scripts/notify.py index 2c86c7697f6d..0ebd01f8621e 100755 --- a/ci/scripts/notify.py +++ b/ci/scripts/notify.py @@ -149,7 +149,7 @@ def format_cmd(messages): cmd=f""" cat <<- YAML | buildkite-agent pipeline upload steps: - - label: "Test" + - label: "trigger failed test notification" command: echo "running failed test notification" && exit 1 notify: - slack: diff --git a/ci/scripts/s3-source-test.sh b/ci/scripts/s3-source-test.sh index 62a58ab3242f..9bcb0d830cb4 100755 --- a/ci/scripts/s3-source-test.sh +++ b/ci/scripts/s3-source-test.sh @@ -4,7 +4,7 @@ set -euo pipefail source ci/scripts/common.sh -while getopts 'p:s:' opt; do +while getopts 'p:s:t:' opt; do case ${opt} in p ) profile=$OPTARG @@ -12,6 +12,9 @@ while getopts 'p:s:' opt; do s ) script=$OPTARG ;; + t ) + format_type=$OPTARG + ;; \? ) echo "Invalid Option: -$OPTARG" 1>&2 exit 1 @@ -30,7 +33,11 @@ risedev ci-start ci-1cn-1fe echo "--- Run test" python3 -m pip install minio psycopg2-binary opendal -python3 e2e_test/s3/"$script" +if [[ -v format_type ]]; then + python3 e2e_test/s3/"$script" "$format_type" +else + python3 e2e_test/s3/"$script" +fi echo "--- Kill cluster" risedev ci-kill diff --git a/ci/workflows/main-cron.yml b/ci/workflows/main-cron.yml index 586d56e8fb64..7cb23f76ce25 100644 --- a/ci/workflows/main-cron.yml +++ b/ci/workflows/main-cron.yml @@ -540,7 +540,7 @@ steps: - label: "S3_v2 source check on AWS (json parser)" key: "s3-v2-source-check-aws-json-parser" - command: "ci/scripts/s3-source-test.sh -p ci-release -s 'fs_source_v2.py json'" + command: "ci/scripts/s3-source-test.sh -p ci-release -s fs_source_v2.py -t json" if: | !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null || build.pull_request.labels includes "ci/run-s3-source-tests" @@ -562,7 +562,7 @@ steps: - label: "S3_v2 source batch read on AWS (json parser)" key: "s3-v2-source-batch-read-check-aws-json-parser" - command: "ci/scripts/s3-source-test.sh -p ci-release -s 'fs_source_batch.py json'" + command: "ci/scripts/s3-source-test.sh -p ci-release -s fs_source_batch.py -t json" if: | !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null || build.pull_request.labels includes "ci/run-s3-source-tests" @@ -584,7 +584,7 @@ steps: - label: "S3_v2 source check on AWS (csv parser)" key: "s3-v2-source-check-aws-csv-parser" - command: "ci/scripts/s3-source-test.sh -p ci-release -s 'fs_source_v2.py csv_without_header'" + command: "ci/scripts/s3-source-test.sh -p ci-release -s fs_source_v2.py -t csv_without_header" if: | !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null || build.pull_request.labels includes "ci/run-s3-source-tests" @@ -606,7 +606,7 @@ steps: - label: "PosixFs source on OpenDAL fs engine (csv parser)" key: "s3-source-test-for-opendal-fs-engine-csv-parser" - command: "ci/scripts/s3-source-test.sh -p ci-release -s 'posix_fs_source.py csv_without_header'" + command: "ci/scripts/s3-source-test.sh -p ci-release -s posix_fs_source.py -t csv_without_header" if: | !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null || build.pull_request.labels includes "ci/run-s3-source-tests"