From 26e733f448d3eee40c3488cc5cdbfe8731f157ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=BF=B5=E5=90=9B=20Nianjun=20Sun?= Date: Wed, 31 Jul 2024 11:55:47 +0800 Subject: [PATCH] Refactor : add dyamic trigger for operation (#32343) --- .../nightly-e2e-operation-dynamic.yml | 6 +-- .github/workflows/nightly-e2e-sql-dynamic.yml | 45 +++++++++---------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/.github/workflows/nightly-e2e-operation-dynamic.yml b/.github/workflows/nightly-e2e-operation-dynamic.yml index e231e0a439203..f6565c0487bef 100644 --- 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 index 9798431ec925c..6ffd93717c22f 100644 --- 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