diff --git a/.dlc.json b/.dlc.json index f2b124ebc..9ee4908aa 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 181769e4c..c442cb72f 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 d0d79da45..ec28918b4 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 e39599840..7245949bb 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 3d840bc54..000000000 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 20ba97410..000000000 Binary files a/test/jacoco/jacococli.jar and /dev/null differ diff --git a/test/plugin/run.sh b/test/plugin/run.sh index ba4462034..5c221089b 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