Skip to content

Commit

Permalink
ci: rename e2e-test to e2e-test-serial (#19942)
Browse files Browse the repository at this point in the history
Signed-off-by: xxchan <[email protected]>
  • Loading branch information
xxchan authored Dec 27, 2024
1 parent b1a5c58 commit 05397f9
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 16 deletions.
8 changes: 0 additions & 8 deletions ci/scripts/cron-e2e-test.sh

This file was deleted.

1 change: 0 additions & 1 deletion ci/scripts/e2e-test.sh → ci/scripts/e2e-test-serial.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
# Exits as soon as any line fails.
set -euo pipefail

source ci/scripts/common.sh
source ci/scripts/pr.env.sh
source ci/scripts/run-e2e-test.sh
2 changes: 2 additions & 0 deletions ci/scripts/run-e2e-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ while getopts 'p:m:' opt; do
done
shift $((OPTIND -1))

source ci/scripts/common.sh

if [[ $mode == "standalone" ]]; then
source ci/scripts/standalone-utils.sh
fi
Expand Down
8 changes: 5 additions & 3 deletions ci/workflows/main-cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ steps:
- label: "end-to-end test ({{matrix.backend}} backend)"
key: "e2e-test-release"
<<: *sql-backend
command: "ci/scripts/cron-e2e-test.sh -p ci-release -m ci-3streaming-2serving-3fe"
command: "ci/scripts/run-e2e-test.sh -p ci-release -m ci-3streaming-2serving-3fe"
env:
- RUN_COMPACTION=1
if: |
!(build.pull_request.labels includes "ci/main-cron/run-selected") && build.env("CI_STEPS") == null
|| build.pull_request.labels includes "ci/run-e2e-test"
Expand Down Expand Up @@ -716,7 +718,7 @@ steps:

- label: "e2e standalone binary test"
key: "e2e-standalone-binary-tests"
command: "ci/scripts/e2e-test.sh -p ci-release -m standalone"
command: "ci/scripts/e2e-test-serial.sh -p ci-release -m standalone"
if: |
!(build.pull_request.labels includes "ci/main-cron/run-selected") && build.env("CI_STEPS") == null
|| build.pull_request.labels includes "ci/run-e2e-standalone-tests"
Expand All @@ -736,7 +738,7 @@ steps:

- label: "e2e single-node binary test"
key: "e2e-single-node-binary-tests"
command: "ci/scripts/e2e-test.sh -p ci-release -m single-node"
command: "ci/scripts/e2e-test-serial.sh -p ci-release -m single-node"
if: |
!(build.pull_request.labels includes "ci/main-cron/run-selected") && build.env("CI_STEPS") == null
|| build.pull_request.labels includes "ci/run-e2e-single-node-tests"
Expand Down
8 changes: 4 additions & 4 deletions ci/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ steps:
retry: *auto-retry

- label: "end-to-end test"
command: "ci/scripts/e2e-test.sh -p ci-dev -m ci-3streaming-2serving-3fe"
command: "ci/scripts/e2e-test-serial.sh -p ci-dev -m ci-3streaming-2serving-3fe"
if: |
!(build.pull_request.labels includes "ci/pr/run-selected") && build.env("CI_STEPS") == null
|| build.pull_request.labels includes "ci/run-e2e-test"
Expand Down Expand Up @@ -800,7 +800,7 @@ steps:
timeout_in_minutes: 30

- label: "e2e standalone binary test"
command: "ci/scripts/e2e-test.sh -p ci-dev -m standalone"
command: "ci/scripts/e2e-test-serial.sh -p ci-dev -m standalone"
if: build.pull_request.labels includes "ci/run-e2e-standalone-tests" || build.env("CI_STEPS") =~ /(^|,)e2e-standalone-tests?(,|$$)/
depends_on:
- "build"
Expand All @@ -816,7 +816,7 @@ steps:
retry: *auto-retry

- label: "e2e single-node binary test"
command: "ci/scripts/e2e-test.sh -p ci-dev -m single-node"
command: "ci/scripts/e2e-test-serial.sh -p ci-dev -m single-node"
if: build.pull_request.labels includes "ci/run-e2e-single-node-tests" || build.env("CI_STEPS") =~ /(^|,)e2e-single-node-tests?(,|$$)/
depends_on:
- "build"
Expand All @@ -833,7 +833,7 @@ steps:

- label: "end-to-end test ({{matrix.label}} backend)"
<<: *other-sql-backend
command: "ci/scripts/e2e-test.sh -p ci-dev -m ci-3streaming-2serving-3fe"
command: "ci/scripts/e2e-test-serial.sh -p ci-dev -m ci-3streaming-2serving-3fe"
if: build.pull_request.labels includes "ci/run-e2e-test-other-backends" || build.env("CI_STEPS") =~ /(^|,)e2e-test-other-backends?(,|$$)/
depends_on:
- "build"
Expand Down

0 comments on commit 05397f9

Please sign in to comment.