This is an automated email from the ASF dual-hosted git repository.
terrymanu 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 686f1ae5b9f Merge PR and nightly Agent E2E workflows (#40060)
686f1ae5b9f is described below
commit 686f1ae5b9f63d3642c023c20fa63155ccc05014
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Oct 6 10:47:39 2026 +0800
Merge PR and nightly Agent E2E workflows (#40060)
* Enable JDBC DistSQL E2E coverage and reuse Proxy datasets
* Fix Standalone mode for nightly JDBC Hive E2E
* Merge PR and nightly Agent E2E workflows
---
.github/workflows/e2e-agent.yml | 6 +-
.github/workflows/nightly-e2e-agent.yml | 138 --------------------------------
2 files changed, 4 insertions(+), 140 deletions(-)
diff --git a/.github/workflows/e2e-agent.yml b/.github/workflows/e2e-agent.yml
index 5789db33ff6..2095ea60487 100644
--- a/.github/workflows/e2e-agent.yml
+++ b/.github/workflows/e2e-agent.yml
@@ -34,6 +34,8 @@ on:
- '!distribution/**/src/main/release-docs/**'
- '!examples/**'
- '!*.md'
+ schedule:
+ - cron: '0 0 * * 1-5' # Once a day between Monday and Friday. UTC time
workflow_dispatch:
concurrency:
@@ -56,7 +58,7 @@ jobs:
name: Build E2E Image
needs: global-environment
runs-on: ${{ needs.global-environment.outputs.GLOBAL_RUNS_ON }}
- timeout-minutes: 20
+ timeout-minutes: ${{ github.event_name == 'schedule' && 40 || 20 }}
steps:
- uses: actions/[email protected]
- id: setup-build-environment
@@ -96,7 +98,7 @@ jobs:
if: github.repository == 'apache/shardingsphere'
needs: [ global-environment, build-e2e-image ]
runs-on: ${{ needs.global-environment.outputs.GLOBAL_RUNS_ON }}
- timeout-minutes: 15
+ timeout-minutes: ${{ github.event_name == 'schedule' && 40 || 15 }}
strategy:
max-parallel: 15
fail-fast: false
diff --git a/.github/workflows/nightly-e2e-agent.yml
b/.github/workflows/nightly-e2e-agent.yml
deleted file mode 100644
index a800eea7c45..00000000000
--- a/.github/workflows/nightly-e2e-agent.yml
+++ /dev/null
@@ -1,138 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-name: Nightly - E2E Agent
-
-on:
- schedule:
- - cron: '0 0 * * 1-5' # Once a day between Monday and Friday. UTC time
- workflow_dispatch:
-
-concurrency:
- group: e2e-${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
-
-permissions:
- contents: read
-
-env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3
-
-jobs:
- global-environment:
- name: Import Global Environment
- uses: ./.github/workflows/reusable-global-environment.yml
-
- build-e2e-image:
- if: github.repository == 'apache/shardingsphere'
- name: Build E2E Image
- needs: global-environment
- runs-on: ${{ needs.global-environment.outputs.GLOBAL_RUNS_ON }}
- timeout-minutes: 40
- steps:
- - uses: actions/[email protected]
- - id: setup-build-environment
- uses: ./.github/workflows/resources/actions/setup-build-environment
- with:
- java-version: 21
- cache-suffix: 'e2e-agent'
- cache-save-enabled: 'false'
- enable-docker-setup: 'true'
- - name: Build Project
- run: ./mvnw -B clean install -DskipTests -Prelease,default-dep
- - name: Build Proxy E2E Image
- run: ./mvnw install -DskipTests -Pe2e.env.proxy -f
test/e2e/agent/engine/pom.xml
- - name: Save Proxy E2E Image
- run: docker save -o /tmp/apache-shardingsphere-proxy-agent-test.tar
apache/shardingsphere-proxy-agent-test:latest
- - uses: actions/upload-artifact@v6
- with:
- name: proxy-e2e-image
- path: /tmp/apache-shardingsphere-proxy-agent-test.tar
- retention-days: 10
- - name: Build JDBC E2E Image
- run: ./mvnw install -DskipTests -Pe2e.env.jdbc -f
test/e2e/agent/engine/pom.xml
- - uses: ./.github/workflows/resources/actions/save-maven-cache
- with:
- cache-hit: ${{ steps.setup-build-environment.outputs.cache-hit }}
- cache-primary-key: ${{
steps.setup-build-environment.outputs.cache-primary-key }}
- - name: Save JDBC E2E Image
- run: docker save -o /tmp/apache-shardingsphere-jdbc-agent-test.tar
apache/shardingsphere-jdbc-agent-test:latest
- - uses: actions/upload-artifact@v6
- with:
- name: jdbc-e2e-image
- path: /tmp/apache-shardingsphere-jdbc-agent-test.tar
- retention-days: 10
-
- agent-mysql:
- name: E2E - Agent with MySQL
- if: github.repository == 'apache/shardingsphere'
- needs: [ global-environment, build-e2e-image ]
- runs-on: ${{ needs.global-environment.outputs.GLOBAL_RUNS_ON }}
- timeout-minutes: 40
- strategy:
- max-parallel: 15
- fail-fast: false
- matrix:
- include:
- - adapter: proxy
- feature: tracing
- plugin: jaeger
- - adapter: proxy
- feature: metrics
- plugin: prometheus
- - adapter: proxy
- feature: logging
- plugin: file
- - adapter: jdbc
- feature: logging
- plugin: file
- - adapter: jdbc
- feature: metrics
- plugin: prometheus
- - adapter: jdbc
- feature: tracing
- plugin: jaeger
- steps:
- - uses: actions/[email protected]
- - uses: ./.github/workflows/resources/actions/setup-build-environment
- with:
- java-version: 21
- cache-suffix: 'e2e-agent'
- cache-save-enabled: 'false'
- enable-docker-setup: 'true'
- - name: Download Proxy E2E Image
- if: matrix.adapter == 'proxy'
- uses: actions/download-artifact@v8
- with:
- name: proxy-e2e-image
- path: /tmp/
- - name: Load Proxy E2E Image
- if: matrix.adapter == 'proxy'
- run: docker load -i /tmp/apache-shardingsphere-proxy-agent-test.tar
- - name: Download JDBC E2E Image
- if: matrix.adapter == 'jdbc'
- uses: actions/download-artifact@v8
- with:
- name: jdbc-e2e-image
- path: /tmp/
- - name: Load JDBC E2E Image
- if: matrix.adapter == 'jdbc'
- run: docker load -i /tmp/apache-shardingsphere-jdbc-agent-test.tar
- - name: Build Project
- run: ./mvnw -B clean install -am -pl test/e2e/agent/plugins/${{
matrix.feature }}/${{ matrix.plugin }} -DskipTests
- - name: Run E2E Test
- run: ./mvnw -nsu -B install -f test/e2e/agent/plugins/${{
matrix.feature }}/${{ matrix.plugin }}/pom.xml -De2e.run.type=DOCKER
-De2e.env.adapter=${{ matrix.adapter }} -De2e.env.plugin=${{ matrix.plugin }}
