[e2e] Remove db docker image after test cases are executed. (apache#2508

)
zhongqishang · Dec 7, 2023 · 0448f97 · 0448f97
1 parent 36e5ded
commit 0448f97
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git a/tools/azure-pipelines/jobs-template.yml b/tools/azure-pipelines/jobs-template.yml
@@ -80,14 +80,14 @@ jobs:
           module: mongodb
         sqlserver:
           module: sqlserver
+        tidb:
+          module: tidb
         db2:
           module: db2
         vitess:
           module: vitess
         misc:
           module: misc
-        e2e_1:
-          module: e2e_1
     steps:
       # download artifact from compile stage
       - task: DownloadPipelineArtifact@2
@@ -146,10 +146,8 @@ jobs:
           module: mysql
         oceanbase:
           module: oceanbase
-        tidb:
-          module: tidb
-        e2e_2:
-          module: e2e_2
+        e2e:
+          module: e2e
     steps:
       # download artifact from compile stage
       - task: DownloadPipelineArtifact@2

diff --git a/tools/ci/stage.sh b/tools/ci/stage.sh
@@ -23,8 +23,7 @@ STAGE_TIDB="tidb"
 STAGE_OCEANBASE="oceanbase"
 STAGE_DB2="db2"
 STAGE_VITESS="vitess"
-STAGE_E2E_1="e2e_1"
-STAGE_E2E_2="e2e_2"
+STAGE_E2E="e2e"
 STAGE_MISC="misc"
 
 MODULES_MYSQL="\
@@ -97,12 +96,7 @@ function get_compile_modules_for_stage() {
         (${STAGE_VITESS})
             echo "-pl $MODULES_VITESS -am"
         ;;
-        (${STAGE_E2E_1})
-            # compile everything; using the -am switch does not work with negated module lists!
-            # the negation takes precedence, thus not all required modules would be built
-            echo ""
-        ;;
-        (${STAGE_E2E_2})
+        (${STAGE_E2E})
             # compile everything; using the -am switch does not work with negated module lists!
             # the negation takes precedence, thus not all required modules would be built
             echo ""
@@ -168,11 +162,8 @@ function get_test_modules_for_stage() {
         (${STAGE_VITESS})
             echo "-pl $modules_vitess"
         ;;
-        (${STAGE_E2E_1})
-            echo "-pl $modules_e2e -Dtest=Db2E2eITCase,MongoE2eITCase,OracleE2eITCase,PostgresE2eITCase,SqlServerE2eITCas,VitessE2eITCase"
-        ;;
-        (${STAGE_E2E_2})
-            echo "-pl $modules_e2e -Dtest=MySqlE2eITCase,TiDBE2eITCase"
+        (${STAGE_E2E})
+            echo "-pl $modules_e2e"
         ;;
         (${STAGE_MISC})
             echo "-pl $modules_misc"