From 05397f91957f9ca9ed7c893ef6b667faf1bae4a0 Mon Sep 17 00:00:00 2001
From: xxchan <xxchan22f@gmail.com>
Date: Fri, 27 Dec 2024 14:25:32 +0800
Subject: [PATCH] ci: rename e2e-test to e2e-test-serial (#19942)

Signed-off-by: xxchan <xxchan22f@gmail.com>
---
 ci/scripts/cron-e2e-test.sh                    | 8 --------
 ci/scripts/{e2e-test.sh => e2e-test-serial.sh} | 1 -
 ci/scripts/run-e2e-test.sh                     | 2 ++
 ci/workflows/main-cron.yml                     | 8 +++++---
 ci/workflows/pull-request.yml                  | 8 ++++----
 5 files changed, 11 insertions(+), 16 deletions(-)
 delete mode 100755 ci/scripts/cron-e2e-test.sh
 rename ci/scripts/{e2e-test.sh => e2e-test-serial.sh} (83%)

diff --git a/ci/scripts/cron-e2e-test.sh b/ci/scripts/cron-e2e-test.sh
deleted file mode 100755
index 7a3b5484f8201..0000000000000
--- a/ci/scripts/cron-e2e-test.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Exits as soon as any line fails.
-set -euo pipefail
-
-source ci/scripts/common.sh
-export RUN_COMPACTION=0;
-source ci/scripts/run-e2e-test.sh
diff --git a/ci/scripts/e2e-test.sh b/ci/scripts/e2e-test-serial.sh
similarity index 83%
rename from ci/scripts/e2e-test.sh
rename to ci/scripts/e2e-test-serial.sh
index 23e5db6ec55ca..40ad27f37b947 100755
--- a/ci/scripts/e2e-test.sh
+++ b/ci/scripts/e2e-test-serial.sh
@@ -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
diff --git a/ci/scripts/run-e2e-test.sh b/ci/scripts/run-e2e-test.sh
index 05fe8515828cb..0bbbf463349ba 100755
--- a/ci/scripts/run-e2e-test.sh
+++ b/ci/scripts/run-e2e-test.sh
@@ -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
diff --git a/ci/workflows/main-cron.yml b/ci/workflows/main-cron.yml
index 4889cd879aa1b..ffbd292048443 100644
--- a/ci/workflows/main-cron.yml
+++ b/ci/workflows/main-cron.yml
@@ -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"
@@ -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"
@@ -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"
diff --git a/ci/workflows/pull-request.yml b/ci/workflows/pull-request.yml
index ddaee50b36feb..1139681a4d5e6 100644
--- a/ci/workflows/pull-request.yml
+++ b/ci/workflows/pull-request.yml
@@ -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"
@@ -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"
@@ -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"
@@ -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"