未验证 提交 8bf38cc2 编写于 作者: D Daming 提交者: GitHub

using openjdk:14-buster as base image of PluginTest (#5404)

上级 b11c3519
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<image> <image>
<name>skywalking/agent-test-jvm:jdk14-${project.version}</name> <name>skywalking/agent-test-jvm:jdk14-${project.version}</name>
<build> <build>
<from>openjdk:14</from> <from>openjdk:14-buster</from>
<workdir>/usr/local/skywalking/scenario</workdir> <workdir>/usr/local/skywalking/scenario</workdir>
<assembly> <assembly>
<mode>dir</mode> <mode>dir</mode>
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
<descriptor>assembly.xml</descriptor> <descriptor>assembly.xml</descriptor>
</assembly> </assembly>
<runCmds> <runCmds>
<run>yum install -y unzip</run>
<run>chmod +x /usr/local/skywalking/run.sh</run> <run>chmod +x /usr/local/skywalking/run.sh</run>
<run>tar -xvf ../tools/skywalking-mock-collector.tar.gz -C ../tools</run> <run>tar -xvf ../tools/skywalking-mock-collector.tar.gz -C ../tools</run>
</runCmds> </runCmds>
......
...@@ -140,7 +140,11 @@ if [[ ! -d ${agent_home} ]]; then ...@@ -140,7 +140,11 @@ if [[ ! -d ${agent_home} ]]; then
echo "[WARN] SkyWalking Agent not exists" echo "[WARN] SkyWalking Agent not exists"
${mvnw} --batch-mode -f ${home}/../../pom.xml -Pagent -DskipTests clean package ${mvnw} --batch-mode -f ${home}/../../pom.xml -Pagent -DskipTests clean package
fi fi
[[ "$force_build" == "on" ]] && ${mvnw} --batch-mode -f ${home}/pom.xml clean package -DskipTests if [[ "$force_build" == "on" ]]; then
profile=
[[ $image_version =~ "jdk14-" ]] && profile="-Pjdk14"
${mvnw} --batch-mode -f ${home}/pom.xml clean package -DskipTests ${profile}
fi
workspace="${home}/workspace/${scenario_name}" workspace="${home}/workspace/${scenario_name}"
[[ -d ${workspace} ]] && rm -rf $workspace [[ -d ${workspace} ]] && rm -rf $workspace
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册