This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 9bbd580b3be Refactor e2e-agent.yml (#24758)
9bbd580b3be is described below
commit 9bbd580b3be28a46753655497156c185af29ca20
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Mar 22 20:39:26 2023 +0800
Refactor e2e-agent.yml (#24758)
* Refactor e2e-agent.yml
---
.github/workflows/e2e-agent.yml | 105 +++++++++++-----------------------------
1 file changed, 28 insertions(+), 77 deletions(-)
diff --git a/.github/workflows/e2e-agent.yml b/.github/workflows/e2e-agent.yml
index 6d10d0e237c..dc1ab5f6ec4 100644
--- a/.github/workflows/e2e-agent.yml
+++ b/.github/workflows/e2e-agent.yml
@@ -24,14 +24,13 @@ on:
- '.github/workflows/e2e-agent.yml'
- '**/pom.xml'
- '**/src/main/**'
- - 'distribution/proxy/**'
+ - '!test/**'
- 'test/pom.xml'
- 'test/e2e/agent/**'
- - '!examples/**'
- '!distribution/**'
- - '!distribution/proxy/src/main/release-docs/**'
- - '!kernel/data-pipeline/**'
- - '!test/**'
+ - 'distribution/proxy/**'
+ - 'distribution/jdbc/**'
+ - '!examples/**'
- '!*.md'
pull_request:
branches: [ master ]
@@ -39,19 +38,18 @@ on:
- '.github/workflows/e2e-agent.yml'
- '**/pom.xml'
- '**/src/main/**'
- - 'distribution/proxy/**'
- '!test/**'
- 'test/pom.xml'
- 'test/e2e/agent/**'
- - '!examples/**'
- '!distribution/**'
- - '!distribution/proxy/src/main/release-docs/**'
- - '!kernel/data-pipeline/**'
+ - 'distribution/proxy/**'
+ - 'distribution/jdbc/**'
+ - '!examples/**'
- '!*.md'
workflow_dispatch:
concurrency:
- group: it-${{ github.workflow }}-${{ github.ref }}
+ group: e2e-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
@@ -59,42 +57,27 @@ env:
REPOSITORY_NAME: shardingsphere
jobs:
- mysql-proxy-agent-tracing:
- name: Agent tracing with MySQL
- runs-on: ubuntu-latest
- strategy:
- matrix:
- plugin: [ jaeger, zipkin ]
- steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
- with:
- distribution: 'temurin'
- java-version: '11'
- - uses: actions/cache@v3
- with:
- path: ~/.m2/repository
- key: ${{ env.REPOSITORY_NAME }}-maven-third-party-${{
hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ env.REPOSITORY_NAME }}-maven-third-party-
- - name: Build Project
- run: |
- ./mvnw -B clean install -DskipITs -DskipTests -Prelease
- - name: Setup JDK 8 for Test
- uses: actions/setup-java@v3
- with:
- distribution: 'temurin'
- java-version: 8
- - name: Run E2E Test
- run: |
- ./mvnw -B clean install -f test/e2e/agent/plugins/tracing/${{
matrix.plugin }}/pom.xml -Dspotless.apply.skip=true -Dit.env.type=${{
matrix.plugin }} -Pit.env.${{ matrix.plugin }}
-
- mysql-proxy-agent-metrics:
- name: Agent metrics with MySQL
+ mysql:
+ name: E2E - Agent with MySQL
runs-on: ubuntu-latest
strategy:
matrix:
- plugin: [ prometheus ]
+ include:
+ - adapter: proxy
+ feature: tracing
+ plugin: jaeger
+ - adapter: proxy
+ feature: tracing
+ plugin: zipkin
+ - adapter: proxy
+ feature: metrics
+ plugin: prometheus
+ - adapter: proxy
+ feature: logging
+ plugin: file
+ - adapter: jdbc
+ feature: logging
+ plugin: file
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
@@ -114,39 +97,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
- java-version: 8
- - name: Run E2E Test
- run: |
- ./mvnw -B clean install -f test/e2e/agent/plugins/metrics/${{
matrix.plugin }}/pom.xml -Dspotless.apply.skip=true -Dit.env.type=${{
matrix.plugin }} -Pit.env.${{ matrix.plugin }}
-
- mysql-proxy-agent-logging:
- name: Agent logging with MySQL
- runs-on: ubuntu-latest
- strategy:
- max-parallel: 1
- matrix:
- adapter: [ proxy, jdbc ]
- plugin: [ file ]
- steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
- with:
- distribution: 'temurin'
- java-version: '11'
- - uses: actions/cache@v3
- with:
- path: ~/.m2/repository
- key: ${{ env.REPOSITORY_NAME }}-maven-third-party-${{
hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ env.REPOSITORY_NAME }}-maven-third-party-
- - name: Build Project
- run: |
- ./mvnw -B clean install -DskipITs -DskipTests -Prelease
- - name: Setup JDK 11 for Test
- uses: actions/setup-java@v3
- with:
- distribution: 'temurin'
- java-version: '11'
+ java-version: '8'
- name: Run E2E Test
run: |
- ./mvnw -B clean install -f test/e2e/agent/plugins/logging/${{
matrix.plugin }}/pom.xml -Dspotless.apply.skip=true -Dit.env.adapter=${{
matrix.adapter }} -Dit.env.type=${{ matrix.plugin }} -Pit.env.${{
matrix.adapter }}.${{ matrix.plugin }}
+ ./mvnw -B clean install -f test/e2e/agent/plugins/${{ matrix.feature
}}/${{ matrix.plugin }}/pom.xml -Dspotless.apply.skip=true -Dit.env.adapter=${{
matrix.adapter }} -Dit.env.type=${{ matrix.plugin }} -Pit.env.${{
matrix.adapter }}.${{ matrix.plugin }}
