From 52d9c7b80bbf1d65f6a17bc8ee52eea8447dbd4f Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Sat, 14 Jan 2023 22:08:21 +0800 Subject: [PATCH] Enable multi remote version integration test (#11306) --- .../build-and-test-scheduled-3.1.yml | 27 +++++++------- .../build-and-test-scheduled-3.2.yml | 24 +++++++------ ...{release-test-3.1.yml => release-test.yml} | 36 ++++++++++--------- 3 files changed, 48 insertions(+), 39 deletions(-) rename .github/workflows/{release-test-3.1.yml => release-test.yml} (96%) diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml b/.github/workflows/build-and-test-scheduled-3.1.yml index f82c01fa3a..e73b013131 100644 --- a/.github/workflows/build-and-test-scheduled-3.1.yml +++ b/.github/workflows/build-and-test-scheduled-3.1.yml @@ -14,10 +14,10 @@ env: SHOW_ERROR_DETAIL: 1 #multi-version size limit VERSIONS_LIMIT: 4 + ALL_REMOTE_VERSION: true CANDIDATE_VERSIONS: ' - spring.version:4.3.30.RELEASE; - spring-boot.version:1.5.22.RELEASE; - spring-boot.version:2.4.1; + spring.version:5.3.24; + spring-boot.version:2.7.6; ' jobs: @@ -216,7 +216,7 @@ jobs: integration-test-prepare: runs-on: ubuntu-latest env: - JOB_COUNT: 3 + JOB_COUNT: 5 steps: - uses: actions/checkout@v3 with: @@ -237,12 +237,13 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 env: - JAVA_VER: 8 + JAVA_VER: ${{matrix.jdk}} TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt strategy: fail-fast: false matrix: - job_id: [1, 2, 3] + jdk: [ 8, 11, 17, 19 ] + job_id: [1, 2, 3, 4, 5] steps: - uses: actions/checkout@v3 with: @@ -269,10 +270,10 @@ jobs: with: name: test-list path: test/jobs/ - - name: "Set up JDK 8" + - name: "Set up JDK ${{matrix.jdk}}" uses: actions/setup-java@v1 with: - java-version: 8 + java-version: ${{matrix.jdk}} - name: "Init Candidate Versions" run: | DUBBO_VERSION="${{needs.build-source.outputs.version}}" @@ -287,7 +288,7 @@ jobs: if: always() uses: actions/upload-artifact@v3 with: - name: test-result + name: test-result-${{matrix.jdk}} path: test/jobs/*-result* integration-test-result: @@ -295,7 +296,10 @@ jobs: if: always() runs-on: ubuntu-latest env: - JAVA_VER: 8 + JAVA_VER: ${{matrix.jdk}} + strategy: + matrix: + jdk: [ 8, 11, 17, 19 ] steps: - uses: actions/checkout@v3 with: @@ -304,12 +308,11 @@ jobs: - name: "Download test result" uses: actions/download-artifact@v3 with: - name: test-result + name: test-result-${{matrix.jdk}} path: test/jobs/ - name: "Merge test result" run: ./test/scripts/merge-test-results.sh - error-code-inspecting: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml b/.github/workflows/build-and-test-scheduled-3.2.yml index 02da5f7520..983c1b3530 100644 --- a/.github/workflows/build-and-test-scheduled-3.2.yml +++ b/.github/workflows/build-and-test-scheduled-3.2.yml @@ -14,10 +14,10 @@ env: SHOW_ERROR_DETAIL: 1 #multi-version size limit VERSIONS_LIMIT: 4 + ALL_REMOTE_VERSION: true CANDIDATE_VERSIONS: ' - spring.version:4.3.30.RELEASE; - spring-boot.version:1.5.22.RELEASE; - spring-boot.version:2.4.1; + spring.version:5.3.24; + spring-boot.version:2.7.6; ' jobs: @@ -216,7 +216,7 @@ jobs: integration-test-prepare: runs-on: ubuntu-latest env: - JOB_COUNT: 3 + JOB_COUNT: 5 steps: - uses: actions/checkout@v3 with: @@ -237,11 +237,12 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 env: - JAVA_VER: 8 + JAVA_VER: ${{matrix.jdk}} TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt strategy: fail-fast: false matrix: + jdk: [ 8, 11, 17, 19 ] job_id: [1, 2, 3] steps: - uses: actions/checkout@v3 @@ -269,10 +270,10 @@ jobs: with: name: test-list path: test/jobs/ - - name: "Set up JDK 8" + - name: "Set up JDK ${{matrix.jdk}}" uses: actions/setup-java@v1 with: - java-version: 8 + java-version: ${{matrix.jdk}} - name: "Init Candidate Versions" run: | DUBBO_VERSION="${{needs.build-source.outputs.version}}" @@ -287,7 +288,7 @@ jobs: if: always() uses: actions/upload-artifact@v3 with: - name: test-result + name: test-result-${{matrix.jdk}} path: test/jobs/*-result* integration-test-result: @@ -295,7 +296,10 @@ jobs: if: always() runs-on: ubuntu-latest env: - JAVA_VER: 8 + JAVA_VER: ${{matrix.jdk}} + strategy: + matrix: + jdk: [ 8, 11, 17, 19 ] steps: - uses: actions/checkout@v3 with: @@ -304,7 +308,7 @@ jobs: - name: "Download test result" uses: actions/download-artifact@v3 with: - name: test-result + name: test-result-${{matrix.jdk}} path: test/jobs/ - name: "Merge test result" run: ./test/scripts/merge-test-results.sh diff --git a/.github/workflows/release-test-3.1.yml b/.github/workflows/release-test.yml similarity index 96% rename from .github/workflows/release-test-3.1.yml rename to .github/workflows/release-test.yml index d5ef981f77..fd23403846 100644 --- a/.github/workflows/release-test-3.1.yml +++ b/.github/workflows/release-test.yml @@ -15,10 +15,10 @@ env: SHOW_ERROR_DETAIL: 1 #multi-version size limit VERSIONS_LIMIT: 4 + ALL_REMOTE_VERSION: true CANDIDATE_VERSIONS: ' - spring.version:4.3.30.RELEASE; - spring-boot.version:1.5.22.RELEASE; - spring-boot.version:2.4.1; + spring.version:5.3.24; + spring-boot.version:2.7.6; ' jobs: @@ -212,7 +212,7 @@ jobs: integration-test-prepare: runs-on: ubuntu-latest env: - JOB_COUNT: 3 + JOB_COUNT: 5 steps: - uses: actions/checkout@v3 with: @@ -222,7 +222,7 @@ jobs: run: | bash ./test/scripts/prepare-test.sh - name: "Upload test list" - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: test-list path: test/jobs @@ -233,11 +233,12 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 env: - JAVA_VER: 8 + JAVA_VER: ${{matrix.jdk}} TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt strategy: fail-fast: false matrix: + jdk: [ 8, 11, 17, 19 ] job_id: [1, 2, 3] steps: - uses: actions/checkout@v3 @@ -261,15 +262,14 @@ jobs: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }} ${{ runner.os }}-dubbo-snapshot- - name: "Download test list" - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: test-list path: test/jobs/ - - name: "Set up JDK 8" - uses: actions/setup-java@v3 + - name: "Set up JDK ${{matrix.jdk}}" + uses: actions/setup-java@v1 with: - java-version: 8 - distribution: 'zulu' + java-version: ${{matrix.jdk}} - name: "Init Candidate Versions" run: | DUBBO_VERSION="${{needs.build-source.outputs.version}}" @@ -282,9 +282,9 @@ jobs: run: cd test && bash ./run-tests.sh - name: "Upload test result" if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: - name: test-result + name: test-result-${{matrix.jdk}} path: test/jobs/*-result* integration-test-result: @@ -292,21 +292,23 @@ jobs: if: always() runs-on: ubuntu-latest env: - JAVA_VER: 8 + JAVA_VER: ${{matrix.jdk}} + strategy: + matrix: + jdk: [ 8, 11, 17, 19 ] steps: - uses: actions/checkout@v3 with: repository: 'apache/dubbo-samples' ref: master - name: "Download test result" - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: - name: test-result + name: test-result-${{matrix.jdk}} path: test/jobs/ - name: "Merge test result" run: ./test/scripts/merge-test-results.sh - error-code-inspecting: runs-on: ubuntu-latest steps: