kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support plugin tests on arm64/v8(aarm) platforms (#379)

This commit is contained in:
Jiajing LU 2022-11-08 22:02:16 +08:00 committed by GitHub
parent 70b3e88b0f
commit 1ef7cb4117
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/build/action.yml vendored
View File

@ -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

2
.github/workflows/plugins-jdk17-test.0.yaml vendored
View File

@ -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:

2
CHANGES.md
View File

@ -5,7 +5,7 @@ Release Notes.
8.14.0
------------------
* Polish test framework to support `arm64/v8` platforms
#### Documentation

2
docs/en/setup/service-agent/java-agent/Plugin-test.md
View File

@ -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`.

6
test/plugin/containers/jvm-container/pom.xml
View File

@ -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>

2
test/plugin/containers/jvm-container/src/main/docker/run.sh
View File

@ -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

2
test/plugin/containers/tomcat-container/pom.xml
View File

@ -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>

12
test/plugin/run.sh
View File

@ -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