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-java.git
The following commit(s) were added to refs/heads/main by this push:
new 1ef7cb4117 Support plugin tests on arm64/v8(aarm) platforms (#379)
1ef7cb4117 is described below
commit 1ef7cb4117aad35bb5de0fb18f51813a455fd2b5
Author: Jiajing LU <[email protected]>
AuthorDate: Tue Nov 8 22:02:16 2022 +0800
Support plugin tests on arm64/v8(aarm) platforms (#379)
---
.github/actions/build/action.yml | 2 +-
.github/workflows/plugins-jdk17-test.0.yaml | 2 +-
CHANGES.md | 2 +-
docs/en/setup/service-agent/java-agent/Plugin-test.md | 2 +-
test/plugin/containers/jvm-container/pom.xml | 6 ++++--
test/plugin/containers/jvm-container/src/main/docker/run.sh | 2 +-
test/plugin/containers/tomcat-container/pom.xml | 2 +-
test/plugin/run.sh | 12 ++++++++++--
8 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index 1966010b3b..affd2a3201 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -22,7 +22,7 @@ inputs:
base_image_java:
description: "The Java Docker image under which this test case will run"
required: false
- default: "adoptopenjdk/openjdk8:alpine"
+ default: "eclipse-temurin:8-jdk"
base_image_tomcat:
description: "The Tomcat Docker image under which this test case will run"
required: false
diff --git a/.github/workflows/plugins-jdk17-test.0.yaml
b/.github/workflows/plugins-jdk17-test.0.yaml
index d5bd5db8d8..45edcbac48 100644
--- a/.github/workflows/plugins-jdk17-test.0.yaml
+++ b/.github/workflows/plugins-jdk17-test.0.yaml
@@ -47,7 +47,7 @@ jobs:
- name: Build
uses: ./.github/actions/build
with:
- base_image_java: eclipse-temurin:17-alpine
+ base_image_java: eclipse-temurin:17-jdk
base_image_tomcat: tomcat:8.5-jdk17-openjdk
test:
diff --git a/CHANGES.md b/CHANGES.md
index 45489342e7..068dbc8179 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,7 @@ Release Notes.
8.14.0
------------------
-
+* Polish test framework to support `arm64/v8` platforms
#### Documentation
diff --git a/docs/en/setup/service-agent/java-agent/Plugin-test.md
b/docs/en/setup/service-agent/java-agent/Plugin-test.md
index a2df65cd59..d4af2a425d 100644
--- a/docs/en/setup/service-agent/java-agent/Plugin-test.md
+++ b/docs/en/setup/service-agent/java-agent/Plugin-test.md
@@ -20,7 +20,7 @@ The test framework provides `JVM-container` and
`Tomcat-container` base images i
### JVM-container Image Introduction
-[JVM-container](../../../../../test/plugin/containers/jvm-container) uses
`adoptopenjdk/openjdk8:alpine-jre` as the base image. `JVM-container` supports
JDK8 and JDK17 as well in CI, which inherits `adoptopenjdk/openjdk8:alpine-jre`
and `eclipse-temurin:17-alpine`.
+[JVM-container](../../../../../test/plugin/containers/jvm-container) uses
`eclipse-temurin:8-jdk` as the base image. `JVM-container` supports JDK8 and
JDK17 as well in CI, which inherits `eclipse-temurin:8-jdk` and
`eclipse-temurin:17-jdk`.
It is supported to custom the base Java docker image by specify
`base_image_java`.
The test case project must be packaged as `project-name.zip`, including
`startup.sh` and uber jar, by using `mvn clean package`.
diff --git a/test/plugin/containers/jvm-container/pom.xml
b/test/plugin/containers/jvm-container/pom.xml
index bb8fdeb606..65d4045469 100644
--- a/test/plugin/containers/jvm-container/pom.xml
+++ b/test/plugin/containers/jvm-container/pom.xml
@@ -36,7 +36,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.33.0</version>
+ <version>0.40.2</version>
<configuration>
<images>
<image>
@@ -52,7 +52,9 @@
<runCmds>
<run>chmod +x
/usr/local/skywalking/run.sh</run>
<run>tar -xvf
../tools/skywalking-mock-collector.tar.gz -C ../tools</run>
- <run>apk add --no-cache bash curl</run>
+ <run>apt-get update -y</run>
+ <run>apt-get install -y unzip</run>
+ <run>rm -rf /var/lib/apt/lists/*</run>
</runCmds>
<cmd>["/usr/local/skywalking/run.sh"]</cmd>
</build>
diff --git a/test/plugin/containers/jvm-container/src/main/docker/run.sh
b/test/plugin/containers/jvm-container/src/main/docker/run.sh
index 3307374cf7..592fb93b3c 100644
--- a/test/plugin/containers/jvm-container/src/main/docker/run.sh
+++ b/test/plugin/containers/jvm-container/src/main/docker/run.sh
@@ -102,7 +102,7 @@ java -jar \
-Xmx256m -Xms256m \
-DcaseName="${SCENARIO_NAME}-${SCENARIO_VERSION}" \
-DtestCasePath=${SCENARIO_HOME}/data/ \
- ${TOOLS_HOME}/skywalking-validator.jar 1>${LOGS_HOME}/validatolr.out
+ ${TOOLS_HOME}/skywalking-validator.jar 1>${LOGS_HOME}/validator.out
status=$?
if [[ $status -eq 0 ]]; then
diff --git a/test/plugin/containers/tomcat-container/pom.xml
b/test/plugin/containers/tomcat-container/pom.xml
index afeaf3c6b3..22db29af94 100644
--- a/test/plugin/containers/tomcat-container/pom.xml
+++ b/test/plugin/containers/tomcat-container/pom.xml
@@ -36,7 +36,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.33.0</version>
+ <version>0.40.2</version>
<configuration>
<images>
<image>
diff --git a/test/plugin/run.sh b/test/plugin/run.sh
index 8056ec65e6..3d3e164839 100755
--- a/test/plugin/run.sh
+++ b/test/plugin/run.sh
@@ -31,7 +31,7 @@ scenarios_home="${home}/scenarios"
num_of_testcases=
container_image_version="1.0.0"
-base_image_java="adoptopenjdk/openjdk8:alpine"
+base_image_java="eclipse-temurin:8-jdk"
base_image_tomcat="tomcat:8.5-jdk8-openjdk"
jacoco_version="${JACOCO_VERSION:-0.8.6}"
@@ -148,6 +148,14 @@ agent_home_selector() {
_agent_home=${target_agent_home}
}
+remove_dir() {
+ dir=$1
+ if [[ "${os}" == "Darwin" ]]; then
+ find ${dir} -type d -exec chmod -a "$(whoami) deny delete" {} \;
+ fi
+ rm -rf $dir
+}
+
start_stamp=`date +%s`
parse_commandline "$@"
@@ -257,7 +265,7 @@ do
bash ${case_work_base}/scenario.sh $debug_mode
1>${case_work_logs_dir}/${testcase_name}.log
status=$?
if [[ $status == 0 ]]; then
- [[ -z $debug_mode ]] && rm -rf ${case_work_base}
+ [[ -z $debug_mode ]] && remove_dir ${case_work_base}
else
exitWithMessage "Testcase ${testcase_name} failed!"
fi
