This is an automated email from the ASF dual-hosted git repository. lujiajing pushed a commit to branch update-docker-maven-plugin in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit 41cf083cdb5f8ba44551816e85da576e98991ac1 Author: Megrez Lu <[email protected]> AuthorDate: Mon Nov 7 23:24:24 2022 +0800 update images and maven plugin --- .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 | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 1966010b3b..6168595b84 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-jre" 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..822380ca95 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-jre 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..8379fec3bb 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-jre` as the base image. `JVM-container` supports JDK8 and JDK17 as well in CI, which inherits `eclipse-temurin:8-jre` and `eclipse-temurin:17-jre`. 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..a7ba23145f 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-jre" base_image_tomcat="tomcat:8.5-jdk8-openjdk" jacoco_version="${JACOCO_VERSION:-0.8.6}"
