This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 e8ff21cb6e1 Improve nightly-e2e-sql.yml : reuse
upload/download-e2e-artifacts composite action (#38307)
e8ff21cb6e1 is described below
commit e8ff21cb6e13c10f5775275c2e95e36c0faab733
Author: Hongsheng Zhong <[email protected]>
AuthorDate: Tue Mar 3 11:20:12 2026 +0800
Improve nightly-e2e-sql.yml : reuse upload/download-e2e-artifacts composite
action (#38307)
* ci(nightly-e2e-sql): rename build-e2e-image job to prepare-e2e-artifacts
* ci(nightly-e2e-sql): use upload/download-e2e-artifacts composite actions
---
.github/workflows/nightly-e2e-sql.yml | 42 +++++------------------------------
1 file changed, 6 insertions(+), 36 deletions(-)
diff --git a/.github/workflows/nightly-e2e-sql.yml
b/.github/workflows/nightly-e2e-sql.yml
index 6bd80a8e5bb..b68df6ab17a 100644
--- a/.github/workflows/nightly-e2e-sql.yml
+++ b/.github/workflows/nightly-e2e-sql.yml
@@ -38,8 +38,8 @@ jobs:
name: Import Global Environment
uses: ./.github/workflows/required-reusable.yml
- build-e2e-image:
- name: Build E2E Image
+ prepare-e2e-artifacts:
+ name: Prepare E2E Artifacts
needs: global-environment
runs-on: ${{ needs.global-environment.outputs.GLOBAL_RUNS_ON }}
timeout-minutes: 40
@@ -49,7 +49,6 @@ jobs:
uses: ./.github/workflows/resources/actions/setup-build-environment
with:
java-version: 21
- cache-prefix: ${{
needs.global-environment.outputs.GLOBAL_CACHE_PREFIX }}
cache-suffix: 'e2e-sql'
cache-save-enabled: 'false'
enable-docker-setup: 'true'
@@ -59,24 +58,11 @@ jobs:
with:
cache-hit: ${{ steps.setup-build-environment.outputs.cache-hit }}
cache-primary-key: ${{
steps.setup-build-environment.outputs.cache-primary-key }}
- - name: Package ShardingSphere Maven Repository
- run: tar -czf /tmp/apache-shardingsphere-maven-repo.tar.gz -C
~/.m2/repository org/apache/shardingsphere
- - name: Save E2E Image
- run: docker save -o /tmp/${{
needs.global-environment.outputs.GLOBAL_CACHE_PREFIX }}-proxy-test.tar
apache/shardingsphere-proxy-test:latest
- - uses: actions/upload-artifact@v4
- with:
- name: e2e-image
- path: /tmp/${{ needs.global-environment.outputs.GLOBAL_CACHE_PREFIX
}}-proxy-test.tar
- retention-days: 10
- - uses: actions/upload-artifact@v4
- with:
- name: e2e-maven-repo
- path: /tmp/apache-shardingsphere-maven-repo.tar.gz
- retention-days: 1
+ - uses: ./.github/workflows/resources/actions/upload-e2e-artifacts
e2e-sql:
name: E2E - SQL
- needs: [ build-e2e-image, global-environment ]
+ needs: [ prepare-e2e-artifacts, global-environment ]
if: ${{ needs.global-environment.outputs.GLOBAL_JOB_ENABLED == 'true' }}
runs-on: ${{ needs.global-environment.outputs.GLOBAL_RUNS_ON }}
timeout-minutes: 200
@@ -119,27 +105,11 @@ jobs:
- uses: ./.github/workflows/resources/actions/setup-build-environment
with:
java-version: 21
- cache-prefix: ${{
needs.global-environment.outputs.GLOBAL_CACHE_PREFIX }}
cache-suffix: 'e2e-sql'
cache-save-enabled: 'false'
enable-docker-setup: 'true'
- - name: Download Maven Repository
- uses: actions/download-artifact@v4
- with:
- name: e2e-maven-repo
- path: /tmp/
- - name: Restore Maven Repository
- run: |
- mkdir -p ~/.m2/repository
- tar -xzf /tmp/apache-shardingsphere-maven-repo.tar.gz -C
~/.m2/repository
- - name: Download E2E Image
- if: matrix.adapter == 'proxy'
- uses: actions/download-artifact@v4
+ - uses: ./.github/workflows/resources/actions/download-e2e-artifacts
with:
- name: e2e-image
- path: /tmp/
- - name: Load E2E Image
- if: matrix.adapter == 'proxy'
- run: docker load -i /tmp/${{
needs.global-environment.outputs.GLOBAL_CACHE_PREFIX }}-proxy-test.tar
+ load-docker-image: ${{ matrix.adapter == 'proxy' }}
- name: Run E2E Test
run: ./mvnw -nsu -B install -f test/e2e/sql/pom.xml
-Dspotless.apply.skip=true -De2e.run.type=DOCKER -De2e.artifact.modes=${{
matrix.mode }} -De2e.artifact.adapters=${{ matrix.adapter }}
-De2e.run.additional.cases=false -De2e.scenarios=${{ matrix.scenario }}
-De2e.artifact.databases=${{ matrix.database }} ${{ matrix.additional-options }}
