Refactor : add dyamic trigger for operation (#32343)

apache · Jul 31, 2024 · 26e733f · 26e733f
1 parent 0e4bac9
commit 26e733f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 26 deletions.
diff --git a/.github/workflows/nightly-e2e-operation-dynamic.yml b/.github/workflows/nightly-e2e-operation-dynamic.yml
@@ -54,9 +54,9 @@ jobs:
       max-parallel: 20
       fail-fast: false
       matrix:
-        java-version: [ 11, 21 ]
-        operation: [ transaction, pipeline, showprocesslist ]
-        image: [ { type: "it.docker.mysql.version", version: "mysql:5.7,mysql:8.0" }, { type: "it.docker.postgresql.version", version: "postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine" }, { type: "it.docker.opengauss.version", version: "enmotech/opengauss:2.1.0,enmotech/opengauss:3.0.0" }, { type: "it.docker.mariadb.version", version: "mariadb:11" } ]
+        java-version: ${{ fromJson(github.event.inputs.java-version) }}
+        operation: ${{ fromJson(github.event.inputs.operation) }}
+        image: ${{ fromJson(github.event.inputs.image) }}
         exclude:
           - operation: transaction
             image: { type: "it.docker.mariadb.version", version: "mariadb:11" }

diff --git a/.github/workflows/nightly-e2e-sql-dynamic.yml b/.github/workflows/nightly-e2e-sql-dynamic.yml
@@ -19,29 +19,28 @@ name: Nightly - E2E SQL Dynamic
 
 on:
   workflow_dispatch:
-    workflow_dispatch:
-      inputs:
-        adapter:
-          description: 'adapter'
-          required: true
-          default: "[ proxy, jdbc ]"
-        mode:
-          description: 'mode'
-          required: true
-          default: "[ Standalone, Cluster ]"
-        database:
-          description: 'database'
-          required: true
-          default: "[ MySQL, PostgreSQL, openGauss ]"
-        scenario:
-          description: 'scenario'
-          required: true
-          default: "[ empty_rules ]"
-        additional-options:
-          description: 'additional-options'
-          required: false
-          default: "[ '' ]"
-
+    inputs:
+      adapter:
+        description: 'adapter'
+        required: true
+        default: "[ proxy, jdbc ]"
+      mode:
+        description: 'mode'
+        required: true
+        default: "[ Standalone, Cluster ]"
+      database:
+        description: 'database'
+        required: true
+        default: "[ MySQL, PostgreSQL, openGauss ]"
+      scenario:
+        description: 'scenario'
+        required: true
+        default: "[ empty_rules ]"
+      additional-options:
+        description: 'additional-options'
+        required: false
+        default: "[ '' ]"
+
 concurrency:
   group: e2e-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true