diff --git a/.dlc.json b/.dlc.json index f2b124ebc1a9637a3e039c6214bc628e1cdf6a1e..9ee4908aa72a92ebfc3088c91be38d6a8b7c9ae9 100644 --- a/.dlc.json +++ b/.dlc.json @@ -5,6 +5,9 @@ }, { "pattern": "^https://github.com/apache/skywalking/blob/master/changes/changes-x.y.z.md$" + }, + { + "pattern": "^https://dist.apache.org/repos/dist/dev/skywalking/x.y.z$" } ], "timeout": "10s", diff --git a/.gitignore b/.gitignore index 181769e4cd3a930c9c237fe50db77f85b9288c7e..c442cb72fbb35197ea4d5613b013dc0f9c9390b2 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ OALLexer.tokens /test/jacoco/classes /test/jacoco/*.exec oap-server/oal-grammar/**/gen/ +test/jacoco diff --git a/test/e2e/e2e-test/pom.xml b/test/e2e/e2e-test/pom.xml index d0d79da45c89b4c98c1a2e32b3f104fc56e13caa..ec28918b49da88762774a0d037b919efc754d960 100755 --- a/test/e2e/e2e-test/pom.xml +++ b/test/e2e/e2e-test/pom.xml @@ -74,4 +74,30 @@ + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + download-jars + compile + + run + + + + + + + + + + + + + + diff --git a/test/e2e/pom.xml b/test/e2e/pom.xml index e39599840e27bb31ea7782e429c22eb362217f69..7245949bb20797b2a5bc5112ccbbbd6ed12d6146 100644 --- a/test/e2e/pom.xml +++ b/test/e2e/pom.xml @@ -67,10 +67,12 @@ 8.0.13 1.18.16 2.4.1 + 0.8.6 2.22.0 3.8.0 3.1.0 + 3.0.0 1.15.1 diff --git a/test/jacoco/jacocoagent.jar b/test/jacoco/jacocoagent.jar deleted file mode 100644 index 3d840bc5466dd0de2d856795ddc409d65f2f5f65..0000000000000000000000000000000000000000 Binary files a/test/jacoco/jacocoagent.jar and /dev/null differ diff --git a/test/jacoco/jacococli.jar b/test/jacoco/jacococli.jar deleted file mode 100644 index 20ba9741026fd56ef86e81aa672182b926368d2b..0000000000000000000000000000000000000000 Binary files a/test/jacoco/jacococli.jar and /dev/null differ diff --git a/test/plugin/run.sh b/test/plugin/run.sh index ba44620348830ccf2645f771ab1979f7c032ccdf..5c221089becee2f3d8aa16af3dada7c2155734b4 100755 --- a/test/plugin/run.sh +++ b/test/plugin/run.sh @@ -31,6 +31,7 @@ scenarios_home="${home}/scenarios" num_of_testcases= image_version="jdk8-1.0.0" +jacoco_version="${JACOCO_VERSION:-0.8.6}" print_help() { echo "Usage: run.sh [OPTION] SCENARIO_NAME" @@ -181,6 +182,10 @@ if [[ -n "${running_mode}" ]]; then agent_home_selector ${running_mode} ${with_plugins} fi +mkdir -p "${jacoco_home}" +ls "${jacoco_home}"/jacocoagent.jar || curl -Lso "${jacoco_home}"/jacocoagent.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/${jacoco_version}/org.jacoco.agent-${jacoco_version}-runtime.jar +ls "${jacoco_home}"/jacocoacli.jar || curl -Lso "${jacoco_home}"/jacococli.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.cli/${jacoco_version}/org.jacoco.cli-${jacoco_version}-nodeps.jar + supported_versions=`grep -v -E "^$|^#" ${supported_version_file}` for version in ${supported_versions} do