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 fc380130717 [CI] Continuous Integration ignore unrelated changes
(#16582)
fc380130717 is described below
commit fc380130717be53cf2b9fa7486bb0a3fe7da389f
Author: Hongsheng Zhong <sand...@126.com>
AuthorDate: Tue Apr 5 15:28:35 2022 +0800
[CI] Continuous Integration ignore unrelated changes (#16582)
* Continuous Integration ignore unrelated changes
* shardingsphere-proxy-distribution change trigger Integration Test
* Do checkstyle for Integration Test modules in it.yml since they're
ignored in Continuous Integration
* Continuous Integration include integration-driver-test changes
* Add agent-prepare job
* Merge agent IT
* Add pom.xml in paths
---
.github/workflows/ci.yml | 28 ++++++++++++++---------
.github/workflows/it.yml | 58 +++++++++++++++++-------------------------------
2 files changed, 38 insertions(+), 48 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a517b6bf285..860071358e7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,18 +23,26 @@ name: Continuous Integration
on:
push:
branches: [ master, dev ]
- paths-ignore:
- - 'docs/**'
- - '*.md'
- - '*.txt'
- - '.*.yaml'
+ paths:
+ - '.github/workflows/**'
+ - '**/pom.xml'
+ - '**/src/main/**'
+ - '**/src/test/**'
+ - '!shardingsphere-distribution/**'
+ - '!shardingsphere-test/shardingsphere-integration-*/**'
+ - 'shardingsphere-test/shardingsphere-integration-driver-test/**'
+ - '!*.md'
pull_request:
branches: [ master ]
- paths-ignore:
- - 'docs/**'
- - '*.md'
- - '*.txt'
- - '.*.yaml'
+ paths:
+ - '.github/workflows/**'
+ - '**/pom.xml'
+ - '**/src/main/**'
+ - '**/src/test/**'
+ - '!shardingsphere-distribution/**'
+ - '!shardingsphere-test/shardingsphere-integration-*/**'
+ - 'shardingsphere-test/shardingsphere-integration-driver-test/**'
+ - '!*.md'
repository_dispatch:
types: [rerun-ci]
schedule:
diff --git a/.github/workflows/it.yml b/.github/workflows/it.yml
index ddf871b1561..e50e71ddd2f 100644
--- a/.github/workflows/it.yml
+++ b/.github/workflows/it.yml
@@ -22,37 +22,39 @@ on:
branches: [ master, dev ]
paths:
- '.github/workflows/**'
+ - '**/pom.xml'
- '**/src/main/**'
- '!examples/**'
- '!shardingsphere-distribution/**'
+ - 'shardingsphere-distribution/shardingsphere-proxy-distribution/**'
+ -
'!shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/**'
- '!shardingsphere-kernel/shardingsphere-data-pipeline/**'
- '!shardingsphere-test/**'
- 'shardingsphere-test/shardingsphere-integration-test/**'
- 'shardingsphere-test/shardingsphere-integration-agent-test/**'
- '!*.md'
- - '!*.txt'
- - '!.*.yaml'
pull_request:
branches: [ master ]
paths:
- '.github/workflows/**'
+ - '**/pom.xml'
- '**/src/main/**'
- '!examples/**'
- '!shardingsphere-distribution/**'
+ - 'shardingsphere-distribution/shardingsphere-proxy-distribution/**'
+ -
'!shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/**'
- '!shardingsphere-kernel/shardingsphere-data-pipeline/**'
- '!shardingsphere-test/**'
- 'shardingsphere-test/shardingsphere-integration-test/**'
- 'shardingsphere-test/shardingsphere-integration-agent-test/**'
- '!*.md'
- - '!*.txt'
- - '!.*.yaml'
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true
-Drat.skip=true -Djacoco.skip=true -Dcheckstyle.skip=true
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true
-Drat.skip=true -Djacoco.skip=true
jobs:
build-it-image:
@@ -116,7 +118,7 @@ jobs:
if: matrix.adapter == 'proxy'
run: docker load -i /tmp/shardingsphere-proxy-test.tar
- name: Run Integration Test
- run: ./mvnw -nsu -B install -f
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
-Dit.run.modes=Cluster -Dit.scenarios=${{ matrix.scenario }}
-Dit.cluster.adapters=${{ matrix.adapter }} -Dit.cluster.databases=${{
matrix.database }} -Dit.cluster.env.type=DOCKER
+ run: ./mvnw -nsu -B install -f
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
-Dcheckstyle.skip=true -Dit.run.modes=Cluster -Dit.scenarios=${{
matrix.scenario }} -Dit.cluster.adapters=${{ matrix.adapter }}
-Dit.cluster.databases=${{ matrix.database }} -Dit.cluster.env.type=DOCKER
it-single-rule:
name: single rule
@@ -151,7 +153,7 @@ jobs:
if: matrix.adapter == 'proxy'
run: docker load -i /tmp/shardingsphere-proxy-test.tar
- name: Run Integration Test
- run: ./mvnw -nsu -B install -f
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
-Dit.run.modes=Cluster -Dit.scenarios=${{ matrix.scenario }}
-Dit.cluster.adapters=${{ matrix.adapter }} -Dit.culster.databases=${{
matrix.database }} -Dit.cluster.env.type=DOCKER
+ run: ./mvnw -nsu -B install -f
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
-Dcheckstyle.skip=true -Dit.run.modes=Cluster -Dit.scenarios=${{
matrix.scenario }} -Dit.cluster.adapters=${{ matrix.adapter }}
-Dit.culster.databases=${{ matrix.database }} -Dit.cluster.env.type=DOCKER
it-mixture-rule:
name: mixture rule
@@ -186,10 +188,10 @@ jobs:
if: matrix.adapter == 'proxy'
run: docker load -i /tmp/shardingsphere-proxy-test.tar
- name: Run Integration Test
- run: ./mvnw -nsu -B install -f
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
-Dit.run.modes=Cluster -Dit.scenarios=${{ matrix.scenario }}
-Dit.cluster.adapters=${{ matrix.adapter }} -Dit.cluster.databases=${{
matrix.database }} -Dit.cluster.env.type=DOCKER
+ run: ./mvnw -nsu -B install -f
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
-Dcheckstyle.skip=true -Dit.run.modes=Cluster -Dit.scenarios=${{
matrix.scenario }} -Dit.cluster.adapters=${{ matrix.adapter }}
-Dit.cluster.databases=${{ matrix.database }} -Dit.cluster.env.type=DOCKER
- mysql-proxy-agent-metrics:
- name: MySQL-Proxy with Agent Metrics
+ mysql-proxy-agent:
+ name: Agent Metrics & OpenTelemetry
runs-on: ubuntu-latest
steps:
- name: Cache Maven Repos
@@ -200,38 +202,18 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- uses: actions/checkout@v2
- - name: Dump concurrency group
- env:
- CON_GROUP: ${{ github.workflow }}-${{ github.ref }}
- run: echo "$CON_GROUP"
- name: Set up JDK 8
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 8
- name: Build Project
- run: ./mvnw -B clean install -DskipITs -DskipTests
+ run: ./mvnw -B clean install -Dcheckstyle.skip=true -DskipITs
-DskipTests
+ - name: Verify
+ run: |
+ ./mvnw -B clean verify -pl
shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics
-DskipITs -DskipTests
+ ./mvnw -B clean verify -pl
shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry
-DskipITs -DskipTests
- name: Run Integration Test
- run: ./mvnw -B clean install -f
shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/pom.xml
-Pit.env.metrics
-
- mysql-proxy-agent-tracing-opentelemetry:
- name: MySQL-Proxy with Agent Tracing OpenTelemetry
- runs-on: ubuntu-latest
- steps:
- - name: Cache Maven Repos
- uses: actions/cache@v2
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-
- - uses: actions/checkout@v2
- - name: Set up JDK 8
- uses: actions/setup-java@v2
- with:
- distribution: 'temurin'
- java-version: 8
- - name: Build Project
- run: ./mvnw -B clean install -DskipITs -DskipTests
- - name: Run Integration Test
- run: ./mvnw -B clean install -f
shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/pom.xml
-Pit.env.opentelemetry
+ run: |
+ ./mvnw -B clean install -f
shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/pom.xml
-Dcheckstyle.skip=true -Pit.env.metrics
+ ./mvnw -B clean install -f
shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/pom.xml
-Dcheckstyle.skip=true -Pit.env.opentelemetry
