This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2 by this push:
new cf410d3462 Move integration test cases into
apache/dubbo-integration-cases (#13506)
cf410d3462 is described below
commit cf410d346208d1af22ce8a73b2d16a85725fc9fa
Author: Albumen Kevin <[email protected]>
AuthorDate: Thu Dec 14 20:57:56 2023 +0800
Move integration test cases into apache/dubbo-integration-cases (#13506)
* Move integration test cases into apache/dubbo-integration-cases
* Update workflow
* Update workflow
---
.github/workflows/build-and-test-pr.yml | 132 ++++++++++++++++--
.github/workflows/build-and-test-scheduled-3.1.yml | 154 +++++++++++++++++----
.github/workflows/build-and-test-scheduled-3.2.yml | 130 ++++++++++++++---
...ed-3.2.yml => build-and-test-scheduled-3.3.yml} | 142 +++++++++++++++----
.github/workflows/release-test.yml | 123 ++++++++++++++--
5 files changed, 589 insertions(+), 92 deletions(-)
diff --git a/.github/workflows/build-and-test-pr.yml
b/.github/workflows/build-and-test-pr.yml
index 2a0238433f..9ba13420b8 100644
--- a/.github/workflows/build-and-test-pr.yml
+++ b/.github/workflows/build-and-test-pr.yml
@@ -211,7 +211,7 @@ jobs:
name: coverage-result
path: "**/target/site/**/jacoco.xml"
- integration-test-prepare:
+ samples-test-prepare:
runs-on: ubuntu-latest
env:
JOB_COUNT: 3
@@ -226,9 +226,111 @@ jobs:
- name: "Upload test list"
uses: actions/upload-artifact@v3
with:
- name: test-list
+ name: samples-test-list
path: test/jobs
+ samples-test-job:
+ needs: [build-source, samples-test-prepare]
+ name: "Samples Test on ubuntu-latest (JobId: ${{matrix.job_id}})"
+ runs-on: ubuntu-latest
+ timeout-minutes: 90
+ env:
+ JAVA_VER: 8
+ TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt
+ strategy:
+ fail-fast: false
+ matrix:
+ job_id: [1, 2, 3]
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-samples'
+ ref: master
+ - name: "Cache local Maven repository"
+ uses: actions/cache@v3
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ ${{ runner.os }}-maven-
+ - name: "Restore Dubbo cache"
+ uses: actions/cache@v3
+ with:
+ path: ~/.m2/repository/org/apache/dubbo
+ key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ ${{ runner.os }}-dubbo-snapshot-
+ - name: "Download test list"
+ uses: actions/download-artifact@v3
+ with:
+ name: samples-test-list
+ path: test/jobs/
+ - name: "Set up JDK 8"
+ uses: actions/setup-java@v3
+ with:
+ distribution: 'zulu'
+ java-version: 8
+ - name: "Init Candidate Versions"
+ run: |
+ DUBBO_VERSION="${{needs.build-source.outputs.version}}"
+
CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;compiler.version:$DUBBO_VERSION;$CANDIDATE_VERSIONS;dubbo.compiler.version:$DUBBO_VERSION"
+ echo "CANDIDATE_VERSIONS=$CANDIDATE_VERSIONS" >> $GITHUB_ENV
+ - name: "Build test image"
+ run: |
+ cd test && bash ./build-test-image.sh
+ - name: "Run tests"
+ run: cd test && bash ./run-tests.sh
+ - name: "merge jacoco resule"
+ run: |
+ cd test/dubbo-test-jacoco-merger && mvn clean compile exec:java
-Dexec.mainClass="org.apache.dubbo.test.JacocoMerge"
-Dexec.args="${{github.workspace}}"
+ - name: "Upload jacoco"
+ uses: actions/upload-artifact@v3
+ with:
+ name: samples-jacoco-result
+ path: target/jacoco*.exec
+ - name: "Upload test result"
+ if: always()
+ uses: actions/upload-artifact@v3
+ with:
+ name: samples-test-result
+ path: test/jobs/*-result*
+ samples-test-result:
+ needs: [samples-test-job]
+ if: always()
+ runs-on: ubuntu-latest
+ env:
+ JAVA_VER: 8
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-samples'
+ ref: master
+ - name: "Download test result"
+ uses: actions/download-artifact@v3
+ with:
+ name: samples-test-result
+ path: test/jobs/
+ - name: "Merge test result"
+ run: ./test/scripts/merge-test-results.sh
+ integration-test-prepare:
+ runs-on: ubuntu-latest
+ env:
+ JOB_COUNT: 3
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-integration-cases'
+ ref: main
+ - name: "Prepare test list"
+ run: |
+ bash ./test/scripts/prepare-test.sh
+ - name: "Upload test list"
+ uses: actions/upload-artifact@v3
+ with:
+ name: test-list
+ path: test/jobs
integration-test-job:
needs: [build-source, integration-test-prepare]
name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}})"
@@ -244,8 +346,8 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
- repository: 'apache/dubbo-samples'
- ref: master
+ repository: 'apache/dubbo-integration-cases'
+ ref: main
- name: "Cache local Maven repository"
uses: actions/cache@v3
with:
@@ -296,7 +398,6 @@ jobs:
with:
name: test-result
path: test/jobs/*-result*
-
integration-test-result:
needs: [integration-test-job]
if: always()
@@ -306,8 +407,8 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
- repository: 'apache/dubbo-samples'
- ref: master
+ repository: 'apache/dubbo-integration-cases'
+ ref: main
- name: "Download test result"
uses: actions/download-artifact@v3
with:
@@ -318,7 +419,7 @@ jobs:
jacoco-result-merge:
runs-on: ubuntu-latest
- needs: [integration-test-result, unit-test]
+ needs: [integration-test-result, samples-test-result, unit-test]
steps:
- uses: actions/checkout@v3
with:
@@ -327,6 +428,10 @@ jobs:
with:
repository: 'apache/dubbo-samples'
path: "./dubbo-samples"
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-integration-cases'
+ path: "./dubbo-integration-cases"
- name: "Set up JDK 21"
uses: actions/setup-java@v3
with:
@@ -344,12 +449,21 @@ jobs:
- name: "Restore jacoco exec"
uses: actions/download-artifact@v3
with:
- name: jacoco-result
+ name: samples-jacoco-result
path: dubbo-samples/target/
+ - name: "Restore integration jacoco exec"
+ uses: actions/download-artifact@v3
+ with:
+ name: jacoco-result
+ path: dubbo-integration-cases/target/
- name: "Merge jacoco result"
run: |
cd ${{ github.workspace
}}/dubbo-samples/test/dubbo-test-jacoco-merger
mvn clean compile exec:java
-Dexec.mainClass="org.apache.dubbo.test.JacocoReport"
-Dexec.args="${{github.workspace}}/dubbo-samples ${{github.workspace}}/dubbo"
+ - name: "Merge samples jacoco result"
+ run: |
+ cd ${{ github.workspace
}}/dubbo-integration-cases/test/dubbo-test-jacoco-merger
+ mvn clean compile exec:java
-Dexec.mainClass="org.apache.dubbo.test.JacocoReport"
-Dexec.args="${{github.workspace}}/dubbo-integration-cases
${{github.workspace}}/dubbo"
- name: "Restore coverage result"
uses: actions/download-artifact@v3
with:
diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml
b/.github/workflows/build-and-test-scheduled-3.1.yml
index 085309806a..aeacdc9cdf 100644
--- a/.github/workflows/build-and-test-scheduled-3.1.yml
+++ b/.github/workflows/build-and-test-scheduled-3.1.yml
@@ -134,7 +134,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-latest ]
- jdk: [ 8, 11, 17, 19 ]
+ jdk: [ 8, 11, 17, 21 ]
env:
DISABLE_FILE_SYSTEM_TEST: true
steps:
@@ -178,18 +178,17 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-latest ]
- jdk: [ 8, 11, 17, 19 ]
+ jdk: [ 8, 11, 17, 21 ]
env:
DISABLE_FILE_SYSTEM_TEST: true
DUBBO_DEFAULT_SERIALIZATION: fastjson2
MAVEN_SUREFIRE_ADD_OPENS: true
steps:
- uses: actions/checkout@v3
- with:
- ref: "3.1"
- name: "Set up JDK ${{ matrix.jdk }}"
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v3
with:
+ distribution: 'zulu'
java-version: ${{ matrix.jdk }}
- uses: actions/cache@v3
name: "Cache local Maven repository"
@@ -207,16 +206,24 @@ jobs:
key: zookeeper-${{ runner.os }}-${{ env.ZOOKEEPER_VERSION }}
restore-keys: |
zookeeper-${{ runner.os }}-
+ - name: "Test with Maven with Integration Tests on JDK 8"
+ timeout-minutes: 70
+ if: ${{ startsWith( matrix.os, 'ubuntu') && matrix.jdk == '8' }}
+ run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify -Pjacoco,'!jdk15ge'
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
-Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false
-DskipIntegrationTests=false -Dcheckstyle.skip=false
-Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true
-DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper
+ - name: "Test with Maven without Integration Tests on JDK 8"
+ timeout-minutes: 90
+ if: ${{ startsWith( matrix.os, 'windows') && matrix.jdk == '8' }}
+ run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify -P"jacoco,'!jdk15ge'"
-D"http.keepAlive=false" -D"maven.wagon.http.pool=false"
-D"maven.wagon.httpconnectionManager.ttlSeconds=120"
-D"maven.wagon.http.retryHandler.count=5" -DskipTests=false
-DskipIntegrationTests=true -D"checkstyle.skip=false"
-D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true"
-D"embeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper"
- name: "Test with Maven with Integration Tests"
timeout-minutes: 70
- if: ${{ startsWith( matrix.os, 'ubuntu') }}
- run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify -Pjacoco
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
-Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false
-DskipIntegrationTests=false -Dcheckstyle.skip=false
-Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true
-DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper
+ if: ${{ startsWith( matrix.os, 'ubuntu') && matrix.jdk != '8' }}
+ run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify
-Pjacoco,jdk15ge-simple,'!jdk15ge'
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
-Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false
-DskipIntegrationTests=false -Dcheckstyle.skip=false
-Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true
-DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper
- name: "Test with Maven without Integration Tests"
timeout-minutes: 90
- if: ${{ startsWith( matrix.os, 'windows') }}
- run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify -Pjacoco
-D"http.keepAlive=false" -D"maven.wagon.http.pool=false"
-D"maven.wagon.httpconnectionManager.ttlSeconds=120"
-D"maven.wagon.http.retryHandler.count=5" -DskipTests=false
-DskipIntegrationTests=true -D"checkstyle.skip=false"
-D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true"
-D"embeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper"
+ if: ${{ startsWith( matrix.os, 'windows') && matrix.jdk != '8' }}
+ run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify
-P"jacoco,jdk15ge-simple,'!jdk15ge'" -D"http.keepAlive=false"
-D"maven.wagon.http.pool=false"
-D"maven.wagon.httpconnectionManager.ttlSeconds=120"
-D"maven.wagon.http.retryHandler.count=5" -DskipTests=false
-DskipIntegrationTests=true -D"checkstyle.skip=false"
-D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true"
-D"embeddedZookeeperPath=${{ github.workspa [...]
- integration-test-prepare:
+ samples-test-prepare:
runs-on: ubuntu-latest
env:
JOB_COUNT: 5
@@ -231,12 +238,11 @@ jobs:
- name: "Upload test list"
uses: actions/upload-artifact@v3
with:
- name: test-list
+ name: samples-test-list
path: test/jobs
-
- integration-test-job:
- needs: [build-source, integration-test-prepare]
- name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}})"
+ samples-test-job:
+ needs: [build-source, samples-test-prepare]
+ name: "Samples Test on ubuntu-latest (JobId: ${{matrix.job_id}} JavaVer:
${{matrix.jdk}})"
runs-on: ubuntu-latest
timeout-minutes: 90
env:
@@ -271,7 +277,7 @@ jobs:
- name: "Download test list"
uses: actions/download-artifact@v3
with:
- name: test-list
+ name: samples-test-list
path: test/jobs/
- name: "Set up JDK ${{matrix.jdk}}"
uses: actions/setup-java@v1
@@ -291,9 +297,106 @@ jobs:
if: always()
uses: actions/upload-artifact@v3
with:
- name: test-result-${{matrix.jdk}}
+ name: samples-test-result-${{matrix.jdk}}
path: test/jobs/*-result*
+ samples-test-result:
+ needs: [samples-test-job]
+ if: always()
+ runs-on: ubuntu-latest
+ env:
+ JAVA_VER: ${{matrix.jdk}}
+ strategy:
+ matrix:
+ jdk: [ 8, 11 ]
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-samples'
+ ref: master
+ - name: "Download test result"
+ uses: actions/download-artifact@v3
+ with:
+ name: samples-test-result-${{matrix.jdk}}
+ path: test/jobs/
+ - name: "Merge test result"
+ run: ./test/scripts/merge-test-results.sh
+ integration-test-prepare:
+ runs-on: ubuntu-latest
+ env:
+ JOB_COUNT: 5
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-integration-cases'
+ ref: main
+ - name: "Prepare test list"
+ run: |
+ bash ./test/scripts/prepare-test.sh
+ - name: "Upload test list"
+ uses: actions/upload-artifact@v3
+ with:
+ name: integration-test-list
+ path: test/jobs
+ integration-test-job:
+ needs: [build-source, integration-test-prepare]
+ name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}}
JavaVer: ${{matrix.jdk}})"
+ runs-on: ubuntu-latest
+ timeout-minutes: 90
+ env:
+ JAVA_VER: ${{matrix.jdk}}
+ TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt
+ strategy:
+ fail-fast: false
+ matrix:
+ jdk: [ 8, 11 ]
+ job_id: [1, 2, 3, 4, 5]
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-integration-cases'
+ ref: main
+ - name: "Cache local Maven repository"
+ uses: actions/cache@v3
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ ${{ runner.os }}-maven-
+ - name: "Restore Dubbo cache"
+ uses: actions/cache@v3
+ with:
+ path: ~/.m2/repository/org/apache/dubbo
+ key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ ${{ runner.os }}-dubbo-snapshot-
+ - name: "Download test list"
+ uses: actions/download-artifact@v3
+ with:
+ name: integration-test-list
+ path: test/jobs/
+ - name: "Set up JDK ${{matrix.jdk}}"
+ uses: actions/setup-java@v1
+ with:
+ java-version: ${{matrix.jdk}}
+ - name: "Init Candidate Versions"
+ run: |
+ DUBBO_VERSION="${{needs.build-source.outputs.version}}"
+
CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;compiler.version:$DUBBO_VERSION;$CANDIDATE_VERSIONS;dubbo.compiler.version:$DUBBO_VERSION"
+ echo "CANDIDATE_VERSIONS=$CANDIDATE_VERSIONS" >> $GITHUB_ENV
+ - name: "Build test image"
+ run: |
+ cd test && bash ./build-test-image.sh
+ - name: "Run tests"
+ run: cd test && bash ./run-tests.sh
+ - name: "Upload test result"
+ if: always()
+ uses: actions/upload-artifact@v3
+ with:
+ name: integration-test-result-${{matrix.jdk}}
+ path: test/jobs/*-result*
integration-test-result:
needs: [integration-test-job]
if: always()
@@ -306,12 +409,12 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
- repository: 'apache/dubbo-samples'
- ref: master
+ repository: 'apache/dubbo-integration-cases'
+ ref: main
- name: "Download test result"
uses: actions/download-artifact@v3
with:
- name: test-result-${{matrix.jdk}}
+ name: integration-test-result-${{matrix.jdk}}
path: test/jobs/
- name: "Merge test result"
run: ./test/scripts/merge-test-results.sh
@@ -330,10 +433,11 @@ jobs:
ref: main
path: "./dubbo-test-tools"
- - name: "Set up JDK 17"
- uses: actions/setup-java@v1
+ - name: "Set up JDK 21"
+ uses: actions/setup-java@v3
with:
- java-version: 17
+ distribution: 'zulu'
+ java-version: 21
- name: "Compile Dubbo (Linux)"
run: |
@@ -392,7 +496,7 @@ jobs:
run: |
cd ${{ github.workspace
}}/dubbo/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider
${{ github.workspace }}/dubbo/mvnw --batch-mode
--no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C clean package
-P native -Dmaven.test.skip=true native:compile
- nohup ./target/demo-native-provider &
+ nohup ./target/dubbo-demo-native-provider &
cd ${{ github.workspace
}}/dubbo/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer
${{ github.workspace }}/dubbo/mvnw --batch-mode
--no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C clean package
-P native -Dmaven.test.skip=true native:compile
- ./target/demo-native-consumer
+ ./target/dubbo-demo-native-consumer
diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml
b/.github/workflows/build-and-test-scheduled-3.2.yml
index 81fa468bc5..a7a8b21663 100644
--- a/.github/workflows/build-and-test-scheduled-3.2.yml
+++ b/.github/workflows/build-and-test-scheduled-3.2.yml
@@ -142,9 +142,8 @@ jobs:
with:
ref: "3.2"
- name: "Set up JDK ${{ matrix.jdk }}"
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v1
with:
- distribution: 'zulu'
java-version: ${{ matrix.jdk }}
- uses: actions/cache@v3
name: "Cache local Maven repository"
@@ -186,8 +185,6 @@ jobs:
MAVEN_SUREFIRE_ADD_OPENS: true
steps:
- uses: actions/checkout@v3
- with:
- ref: "3.2"
- name: "Set up JDK ${{ matrix.jdk }}"
uses: actions/setup-java@v3
with:
@@ -226,7 +223,7 @@ jobs:
if: ${{ startsWith( matrix.os, 'windows') && matrix.jdk != '8' }}
run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify
-P"jacoco,jdk15ge-simple,'!jdk15ge'" -D"http.keepAlive=false"
-D"maven.wagon.http.pool=false"
-D"maven.wagon.httpconnectionManager.ttlSeconds=120"
-D"maven.wagon.http.retryHandler.count=5" -DskipTests=false
-DskipIntegrationTests=true -D"checkstyle.skip=false"
-D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true"
-D"embeddedZookeeperPath=${{ github.workspa [...]
- integration-test-prepare:
+ samples-test-prepare:
runs-on: ubuntu-latest
env:
JOB_COUNT: 5
@@ -241,12 +238,11 @@ jobs:
- name: "Upload test list"
uses: actions/upload-artifact@v3
with:
- name: test-list
+ name: samples-test-list
path: test/jobs
-
- integration-test-job:
- needs: [build-source, integration-test-prepare]
- name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}})"
+ samples-test-job:
+ needs: [build-source, samples-test-prepare]
+ name: "Samples Test on ubuntu-latest (JobId: ${{matrix.job_id}} JavaVer:
${{matrix.jdk}})"
runs-on: ubuntu-latest
timeout-minutes: 90
env:
@@ -281,12 +277,11 @@ jobs:
- name: "Download test list"
uses: actions/download-artifact@v3
with:
- name: test-list
+ name: samples-test-list
path: test/jobs/
- name: "Set up JDK ${{matrix.jdk}}"
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v1
with:
- distribution: 'zulu'
java-version: ${{matrix.jdk}}
- name: "Init Candidate Versions"
run: |
@@ -302,9 +297,106 @@ jobs:
if: always()
uses: actions/upload-artifact@v3
with:
- name: test-result-${{matrix.jdk}}
+ name: samples-test-result-${{matrix.jdk}}
path: test/jobs/*-result*
+ samples-test-result:
+ needs: [samples-test-job]
+ if: always()
+ runs-on: ubuntu-latest
+ env:
+ JAVA_VER: ${{matrix.jdk}}
+ strategy:
+ matrix:
+ jdk: [ 8, 11, 17, 21 ]
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-samples'
+ ref: master
+ - name: "Download test result"
+ uses: actions/download-artifact@v3
+ with:
+ name: samples-test-result-${{matrix.jdk}}
+ path: test/jobs/
+ - name: "Merge test result"
+ run: ./test/scripts/merge-test-results.sh
+ integration-test-prepare:
+ runs-on: ubuntu-latest
+ env:
+ JOB_COUNT: 5
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-integration-cases'
+ ref: main
+ - name: "Prepare test list"
+ run: |
+ bash ./test/scripts/prepare-test.sh
+ - name: "Upload test list"
+ uses: actions/upload-artifact@v3
+ with:
+ name: integration-test-list
+ path: test/jobs
+ integration-test-job:
+ needs: [build-source, integration-test-prepare]
+ name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}}
JavaVer: ${{matrix.jdk}})"
+ runs-on: ubuntu-latest
+ timeout-minutes: 90
+ env:
+ JAVA_VER: ${{matrix.jdk}}
+ TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt
+ strategy:
+ fail-fast: false
+ matrix:
+ jdk: [ 8, 11, 17, 21 ]
+ job_id: [1, 2, 3, 4, 5]
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-integration-cases'
+ ref: main
+ - name: "Cache local Maven repository"
+ uses: actions/cache@v3
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ ${{ runner.os }}-maven-
+ - name: "Restore Dubbo cache"
+ uses: actions/cache@v3
+ with:
+ path: ~/.m2/repository/org/apache/dubbo
+ key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ ${{ runner.os }}-dubbo-snapshot-
+ - name: "Download test list"
+ uses: actions/download-artifact@v3
+ with:
+ name: integration-test-list
+ path: test/jobs/
+ - name: "Set up JDK ${{matrix.jdk}}"
+ uses: actions/setup-java@v1
+ with:
+ java-version: ${{matrix.jdk}}
+ - name: "Init Candidate Versions"
+ run: |
+ DUBBO_VERSION="${{needs.build-source.outputs.version}}"
+
CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;compiler.version:$DUBBO_VERSION;$CANDIDATE_VERSIONS;dubbo.compiler.version:$DUBBO_VERSION"
+ echo "CANDIDATE_VERSIONS=$CANDIDATE_VERSIONS" >> $GITHUB_ENV
+ - name: "Build test image"
+ run: |
+ cd test && bash ./build-test-image.sh
+ - name: "Run tests"
+ run: cd test && bash ./run-tests.sh
+ - name: "Upload test result"
+ if: always()
+ uses: actions/upload-artifact@v3
+ with:
+ name: integration-test-result-${{matrix.jdk}}
+ path: test/jobs/*-result*
integration-test-result:
needs: [integration-test-job]
if: always()
@@ -317,12 +409,12 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
- repository: 'apache/dubbo-samples'
- ref: master
+ repository: 'apache/dubbo-integration-cases'
+ ref: main
- name: "Download test result"
uses: actions/download-artifact@v3
with:
- name: test-result-${{matrix.jdk}}
+ name: integration-test-result-${{matrix.jdk}}
path: test/jobs/
- name: "Merge test result"
run: ./test/scripts/merge-test-results.sh
@@ -341,11 +433,11 @@ jobs:
ref: main
path: "./dubbo-test-tools"
- - name: "Set up JDK 17"
+ - name: "Set up JDK 21"
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 17
+ java-version: 21
- name: "Compile Dubbo (Linux)"
run: |
diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml
b/.github/workflows/build-and-test-scheduled-3.3.yml
similarity index 83%
copy from .github/workflows/build-and-test-scheduled-3.2.yml
copy to .github/workflows/build-and-test-scheduled-3.3.yml
index 81fa468bc5..8c41bf3a56 100644
--- a/.github/workflows/build-and-test-scheduled-3.2.yml
+++ b/.github/workflows/build-and-test-scheduled-3.3.yml
@@ -1,4 +1,4 @@
-name: Build and Test Scheduled On 3.2
+name: Build and Test Scheduled On 3.3
on:
schedule:
@@ -26,7 +26,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
- ref: "3.2"
+ ref: "3.3"
- name: Check License
uses: apache/skywalking-eyes@main
env:
@@ -38,7 +38,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
- ref: "3.2"
+ ref: "3.3"
path: dubbo
- uses: actions/setup-java@v3
with:
@@ -140,11 +140,10 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
- ref: "3.2"
+ ref: "3.3"
- name: "Set up JDK ${{ matrix.jdk }}"
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v1
with:
- distribution: 'zulu'
java-version: ${{ matrix.jdk }}
- uses: actions/cache@v3
name: "Cache local Maven repository"
@@ -186,8 +185,6 @@ jobs:
MAVEN_SUREFIRE_ADD_OPENS: true
steps:
- uses: actions/checkout@v3
- with:
- ref: "3.2"
- name: "Set up JDK ${{ matrix.jdk }}"
uses: actions/setup-java@v3
with:
@@ -226,7 +223,7 @@ jobs:
if: ${{ startsWith( matrix.os, 'windows') && matrix.jdk != '8' }}
run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify
-P"jacoco,jdk15ge-simple,'!jdk15ge'" -D"http.keepAlive=false"
-D"maven.wagon.http.pool=false"
-D"maven.wagon.httpconnectionManager.ttlSeconds=120"
-D"maven.wagon.http.retryHandler.count=5" -DskipTests=false
-DskipIntegrationTests=true -D"checkstyle.skip=false"
-D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true"
-D"embeddedZookeeperPath=${{ github.workspa [...]
- integration-test-prepare:
+ samples-test-prepare:
runs-on: ubuntu-latest
env:
JOB_COUNT: 5
@@ -241,12 +238,11 @@ jobs:
- name: "Upload test list"
uses: actions/upload-artifact@v3
with:
- name: test-list
+ name: samples-test-list
path: test/jobs
-
- integration-test-job:
- needs: [build-source, integration-test-prepare]
- name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}})"
+ samples-test-job:
+ needs: [build-source, samples-test-prepare]
+ name: "Samples Test on ubuntu-latest (JobId: ${{matrix.job_id}} JavaVer:
${{matrix.jdk}})"
runs-on: ubuntu-latest
timeout-minutes: 90
env:
@@ -281,12 +277,11 @@ jobs:
- name: "Download test list"
uses: actions/download-artifact@v3
with:
- name: test-list
+ name: samples-test-list
path: test/jobs/
- name: "Set up JDK ${{matrix.jdk}}"
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v1
with:
- distribution: 'zulu'
java-version: ${{matrix.jdk}}
- name: "Init Candidate Versions"
run: |
@@ -302,9 +297,106 @@ jobs:
if: always()
uses: actions/upload-artifact@v3
with:
- name: test-result-${{matrix.jdk}}
+ name: samples-test-result-${{matrix.jdk}}
path: test/jobs/*-result*
+ samples-test-result:
+ needs: [samples-test-job]
+ if: always()
+ runs-on: ubuntu-latest
+ env:
+ JAVA_VER: ${{matrix.jdk}}
+ strategy:
+ matrix:
+ jdk: [ 8, 11, 17, 21 ]
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-samples'
+ ref: master
+ - name: "Download test result"
+ uses: actions/download-artifact@v3
+ with:
+ name: samples-test-result-${{matrix.jdk}}
+ path: test/jobs/
+ - name: "Merge test result"
+ run: ./test/scripts/merge-test-results.sh
+ integration-test-prepare:
+ runs-on: ubuntu-latest
+ env:
+ JOB_COUNT: 5
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-integration-cases'
+ ref: main
+ - name: "Prepare test list"
+ run: |
+ bash ./test/scripts/prepare-test.sh
+ - name: "Upload test list"
+ uses: actions/upload-artifact@v3
+ with:
+ name: integration-test-list
+ path: test/jobs
+ integration-test-job:
+ needs: [build-source, integration-test-prepare]
+ name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}}
JavaVer: ${{matrix.jdk}})"
+ runs-on: ubuntu-latest
+ timeout-minutes: 90
+ env:
+ JAVA_VER: ${{matrix.jdk}}
+ TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt
+ strategy:
+ fail-fast: false
+ matrix:
+ jdk: [ 8, 11, 17, 21 ]
+ job_id: [1, 2, 3, 4, 5]
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-integration-cases'
+ ref: main
+ - name: "Cache local Maven repository"
+ uses: actions/cache@v3
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ ${{ runner.os }}-maven-
+ - name: "Restore Dubbo cache"
+ uses: actions/cache@v3
+ with:
+ path: ~/.m2/repository/org/apache/dubbo
+ key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ ${{ runner.os }}-dubbo-snapshot-
+ - name: "Download test list"
+ uses: actions/download-artifact@v3
+ with:
+ name: integration-test-list
+ path: test/jobs/
+ - name: "Set up JDK ${{matrix.jdk}}"
+ uses: actions/setup-java@v1
+ with:
+ java-version: ${{matrix.jdk}}
+ - name: "Init Candidate Versions"
+ run: |
+ DUBBO_VERSION="${{needs.build-source.outputs.version}}"
+
CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;compiler.version:$DUBBO_VERSION;$CANDIDATE_VERSIONS;dubbo.compiler.version:$DUBBO_VERSION"
+ echo "CANDIDATE_VERSIONS=$CANDIDATE_VERSIONS" >> $GITHUB_ENV
+ - name: "Build test image"
+ run: |
+ cd test && bash ./build-test-image.sh
+ - name: "Run tests"
+ run: cd test && bash ./run-tests.sh
+ - name: "Upload test result"
+ if: always()
+ uses: actions/upload-artifact@v3
+ with:
+ name: integration-test-result-${{matrix.jdk}}
+ path: test/jobs/*-result*
integration-test-result:
needs: [integration-test-job]
if: always()
@@ -317,12 +409,12 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
- repository: 'apache/dubbo-samples'
- ref: master
+ repository: 'apache/dubbo-integration-cases'
+ ref: main
- name: "Download test result"
uses: actions/download-artifact@v3
with:
- name: test-result-${{matrix.jdk}}
+ name: integration-test-result-${{matrix.jdk}}
path: test/jobs/
- name: "Merge test result"
run: ./test/scripts/merge-test-results.sh
@@ -332,7 +424,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
- ref: "3.2"
+ ref: "3.3"
path: "./dubbo"
- uses: actions/checkout@v3
@@ -341,11 +433,11 @@ jobs:
ref: main
path: "./dubbo-test-tools"
- - name: "Set up JDK 17"
+ - name: "Set up JDK 21"
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 17
+ java-version: 21
- name: "Compile Dubbo (Linux)"
run: |
@@ -371,7 +463,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
- ref: "3.2"
+ ref: "3.3"
path: "./dubbo"
- name: "Setup GraalVM environment"
diff --git a/.github/workflows/release-test.yml
b/.github/workflows/release-test.yml
index 4f42dd95d6..a0250eec9c 100644
--- a/.github/workflows/release-test.yml
+++ b/.github/workflows/release-test.yml
@@ -220,7 +220,7 @@ jobs:
if: ${{ startsWith( matrix.os, 'windows') && matrix.jdk != '8' }}
run: ./mvnw --batch-mode --no-snapshot-updates -e
--no-transfer-progress --fail-fast clean test verify
-P"jacoco,jdk15ge-simple,'!jdk15ge'" -D"http.keepAlive=false"
-D"maven.wagon.http.pool=false"
-D"maven.wagon.httpconnectionManager.ttlSeconds=120"
-D"maven.wagon.http.retryHandler.count=5" -DskipTests=false
-DskipIntegrationTests=true -D"checkstyle.skip=false"
-D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true"
-D"embeddedZookeeperPath=${{ github.workspa [...]
- integration-test-prepare:
+ samples-test-prepare:
runs-on: ubuntu-latest
env:
JOB_COUNT: 5
@@ -235,12 +235,11 @@ jobs:
- name: "Upload test list"
uses: actions/upload-artifact@v3
with:
- name: test-list
+ name: samples-test-list
path: test/jobs
-
- integration-test-job:
- needs: [build-source, integration-test-prepare]
- name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}})"
+ samples-test-job:
+ needs: [build-source, samples-test-prepare]
+ name: "Samples Test on ubuntu-latest (JobId: ${{matrix.job_id}} JavaVer:
${{matrix.jdk}})"
runs-on: ubuntu-latest
timeout-minutes: 90
env:
@@ -275,7 +274,7 @@ jobs:
- name: "Download test list"
uses: actions/download-artifact@v3
with:
- name: test-list
+ name: samples-test-list
path: test/jobs/
- name: "Set up JDK ${{matrix.jdk}}"
uses: actions/setup-java@v1
@@ -295,9 +294,106 @@ jobs:
if: always()
uses: actions/upload-artifact@v3
with:
- name: test-result-${{matrix.jdk}}
+ name: samples-test-result-${{matrix.jdk}}
path: test/jobs/*-result*
+ samples-test-result:
+ needs: [samples-test-job]
+ if: always()
+ runs-on: ubuntu-latest
+ env:
+ JAVA_VER: ${{matrix.jdk}}
+ strategy:
+ matrix:
+ jdk: [ 8, 11, 17, 21 ]
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-samples'
+ ref: master
+ - name: "Download test result"
+ uses: actions/download-artifact@v3
+ with:
+ name: samples-test-result-${{matrix.jdk}}
+ path: test/jobs/
+ - name: "Merge test result"
+ run: ./test/scripts/merge-test-results.sh
+ integration-test-prepare:
+ runs-on: ubuntu-latest
+ env:
+ JOB_COUNT: 5
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-integration-cases'
+ ref: main
+ - name: "Prepare test list"
+ run: |
+ bash ./test/scripts/prepare-test.sh
+ - name: "Upload test list"
+ uses: actions/upload-artifact@v3
+ with:
+ name: integration-test-list
+ path: test/jobs
+ integration-test-job:
+ needs: [build-source, integration-test-prepare]
+ name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}}
JavaVer: ${{matrix.jdk}})"
+ runs-on: ubuntu-latest
+ timeout-minutes: 90
+ env:
+ JAVA_VER: ${{matrix.jdk}}
+ TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt
+ strategy:
+ fail-fast: false
+ matrix:
+ jdk: [ 8, 11, 17, 21 ]
+ job_id: [1, 2, 3, 4, 5]
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: 'apache/dubbo-integration-cases'
+ ref: main
+ - name: "Cache local Maven repository"
+ uses: actions/cache@v3
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ ${{ runner.os }}-maven-
+ - name: "Restore Dubbo cache"
+ uses: actions/cache@v3
+ with:
+ path: ~/.m2/repository/org/apache/dubbo
+ key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}-${{
github.run_id }}
+ restore-keys: |
+ ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
+ ${{ runner.os }}-dubbo-snapshot-
+ - name: "Download test list"
+ uses: actions/download-artifact@v3
+ with:
+ name: integration-test-list
+ path: test/jobs/
+ - name: "Set up JDK ${{matrix.jdk}}"
+ uses: actions/setup-java@v1
+ with:
+ java-version: ${{matrix.jdk}}
+ - name: "Init Candidate Versions"
+ run: |
+ DUBBO_VERSION="${{needs.build-source.outputs.version}}"
+
CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;compiler.version:$DUBBO_VERSION;$CANDIDATE_VERSIONS;dubbo.compiler.version:$DUBBO_VERSION"
+ echo "CANDIDATE_VERSIONS=$CANDIDATE_VERSIONS" >> $GITHUB_ENV
+ - name: "Build test image"
+ run: |
+ cd test && bash ./build-test-image.sh
+ - name: "Run tests"
+ run: cd test && bash ./run-tests.sh
+ - name: "Upload test result"
+ if: always()
+ uses: actions/upload-artifact@v3
+ with:
+ name: integration-test-result-${{matrix.jdk}}
+ path: test/jobs/*-result*
integration-test-result:
needs: [integration-test-job]
if: always()
@@ -310,12 +406,12 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
- repository: 'apache/dubbo-samples'
- ref: master
+ repository: 'apache/dubbo-integration-cases'
+ ref: main
- name: "Download test result"
uses: actions/download-artifact@v3
with:
- name: test-result-${{matrix.jdk}}
+ name: integration-test-result-${{matrix.jdk}}
path: test/jobs/
- name: "Merge test result"
run: ./test/scripts/merge-test-results.sh
@@ -333,10 +429,10 @@ jobs:
ref: main
path: "./dubbo-test-tools"
- - name: "Set up JDK 17"
+ - name: "Set up JDK 21"
uses: actions/setup-java@v3
with:
- java-version: 17
+ java-version: 21
distribution: 'zulu'
- name: "Compile Dubbo (Linux)"
@@ -363,7 +459,6 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
- ref: "3.2"
path: "./dubbo"
- name: "Setup GraalVM environment"
