This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-graalvm-distro.git
The following commit(s) were added to refs/heads/main by this push:
new a67cc78 E2E: use pre-built test service images from GHCR
a67cc78 is described below
commit a67cc7886d1ea2b6cdac7e2df04ba21086d748c0
Author: Wu Sheng <[email protected]>
AuthorDate: Thu Feb 26 16:13:22 2026 +0800
E2E: use pre-built test service images from GHCR
Replace local JAR volume-mounts with pre-built images from
ghcr.io/apache/skywalking. Init containers copy JARs into a
shared volume, then the skywalking-java agent image runs them.
Add test/e2e/script/env with all commit IDs for pre-built images.
---
.../e2e/cases/simple-java-agent/docker-compose.yml | 73 ++++++++++++++++++++--
test/e2e/cases/simple-java-agent/e2e.yaml | 2 +-
test/e2e/script/env | 23 +++++++
3 files changed, 91 insertions(+), 7 deletions(-)
diff --git a/test/e2e/cases/simple-java-agent/docker-compose.yml
b/test/e2e/cases/simple-java-agent/docker-compose.yml
index cc0b62c..8910c11 100644
--- a/test/e2e/cases/simple-java-agent/docker-compose.yml
+++ b/test/e2e/cases/simple-java-agent/docker-compose.yml
@@ -43,25 +43,86 @@ services:
timeout: 60s
retries: 120
+ # Init containers: copy pre-built service JARs into a shared volume
+ provider-jar:
+ image:
"ghcr.io/apache/skywalking/e2e-service-provider:${SW_E2E_SERVICE_COMMIT}"
+ entrypoint: ["cp", "/app.jar", "/jars/services_provider.jar"]
+ volumes:
+ - service-jars:/jars
+ networks:
+ - e2e
+
+ consumer-jar:
+ image:
"ghcr.io/apache/skywalking/e2e-service-consumer:${SW_E2E_SERVICE_COMMIT}"
+ entrypoint: ["cp", "/app.jar", "/jars/services_consumer.jar"]
+ volumes:
+ - service-jars:/jars
+ networks:
+ - e2e
+
provider:
- extends:
- file:
../../../../skywalking/test/e2e-v2/script/docker-compose/base-compose.yml
- service: provider
+ image:
"ghcr.io/apache/skywalking-java/skywalking-java:${SW_AGENT_JAVA_COMMIT}-java${SW_AGENT_JDK_VERSION}"
+ command: ["java", "-jar", "/jars/services_provider.jar"]
+ volumes:
+ - service-jars:/jars
+ networks:
+ - e2e
+ expose:
+ - 9090
ports:
- 9090
+ environment:
+ SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap:11800
+ SW_LOGGING_OUTPUT: CONSOLE
+ SW_AGENT_NAME: e2e-service-provider
+ SW_AGENT_INSTANCE_NAME: provider1
+ SW_AGENT_COLLECTOR_GET_PROFILE_TASK_INTERVAL: 1
+ SW_AGENT_COLLECTOR_GET_AGENT_DYNAMIC_CONFIG_INTERVAL: 1
+ SW_METER_ACTIVE: 'false'
+ healthcheck:
+ test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9090"]
+ interval: 5s
+ timeout: 60s
+ retries: 120
depends_on:
oap:
condition: service_healthy
+ provider-jar:
+ condition: service_completed_successfully
consumer:
- extends:
- file:
../../../../skywalking/test/e2e-v2/script/docker-compose/base-compose.yml
- service: consumer
+ image:
"ghcr.io/apache/skywalking-java/skywalking-java:${SW_AGENT_JAVA_COMMIT}-java${SW_AGENT_JDK_VERSION}"
+ command: ["java", "-jar", "/jars/services_consumer.jar"]
+ volumes:
+ - service-jars:/jars
+ networks:
+ - e2e
+ expose:
+ - 9092
ports:
- 9092
+ environment:
+ SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap:11800
+ SW_LOGGING_OUTPUT: CONSOLE
+ PROVIDER_URL: http://provider:9090
+ SW_AGENT_NAME: e2e-service-consumer
+ SW_AGENT_INSTANCE_NAME: consumer1
+ SW_AGENT_COLLECTOR_GET_PROFILE_TASK_INTERVAL: 1
+ SW_AGENT_COLLECTOR_GET_AGENT_DYNAMIC_CONFIG_INTERVAL: 1
+ SW_METER_ACTIVE: 'false'
+ healthcheck:
+ test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9092"]
+ interval: 5s
+ timeout: 60s
+ retries: 120
depends_on:
provider:
condition: service_healthy
+ consumer-jar:
+ condition: service_completed_successfully
+
+volumes:
+ service-jars:
networks:
e2e:
diff --git a/test/e2e/cases/simple-java-agent/e2e.yaml
b/test/e2e/cases/simple-java-agent/e2e.yaml
index 899efa6..9fda428 100644
--- a/test/e2e/cases/simple-java-agent/e2e.yaml
+++ b/test/e2e/cases/simple-java-agent/e2e.yaml
@@ -20,7 +20,7 @@ setup:
env: compose
file: docker-compose.yml
timeout: 20m
- init-system-environment: ../../../../skywalking/test/e2e-v2/script/env
+ init-system-environment: ../../script/env
steps:
- name: set PATH
command: export PATH=/tmp/skywalking-infra-e2e/bin:$PATH
diff --git a/test/e2e/script/env b/test/e2e/script/env
new file mode 100644
index 0000000..a22514f
--- /dev/null
+++ b/test/e2e/script/env
@@ -0,0 +1,23 @@
+# 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.
+
+# Pre-built images from ghcr.io/apache/skywalking and
ghcr.io/apache/skywalking-java.
+# Update when syncing the skywalking submodule.
+SW_AGENT_JAVA_COMMIT=2a61027e5eb74ed1258c764ae2ffeabd499416a6
+SW_BANYANDB_COMMIT=208982aaa11092bc38018a9e1b24eda67e829312
+SW_CTL_COMMIT=9a1beab08413ce415a00a8547a238a14691c5655
+
+# Last upstream commit that touched test/e2e-v2/java-test-service/
+SW_E2E_SERVICE_COMMIT=5e3b3853f5742f906655f3e332459c74b58cfb43
