You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/03/28 10:37:58 UTC
[skywalking] branch master updated: Remove binary files and
download them in CI process instead (#6631)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new db9cc26 Remove binary files and download them in CI process instead (#6631)
db9cc26 is described below
commit db9cc26977690faeb0bc3c9cb1c8f5b326d38621
Author: Zhenxu Ke <ke...@apache.org>
AuthorDate: Sun Mar 28 18:37:33 2021 +0800
Remove binary files and download them in CI process instead (#6631)
---
.dlc.json | 3 +++
.gitignore | 1 +
test/e2e/e2e-test/pom.xml | 26 ++++++++++++++++++++++++++
test/e2e/pom.xml | 2 ++
test/jacoco/jacocoagent.jar | Bin 281989 -> 0 bytes
test/jacoco/jacococli.jar | Bin 551134 -> 0 bytes
test/plugin/run.sh | 5 +++++
7 files changed, 37 insertions(+)
diff --git a/.dlc.json b/.dlc.json
index f2b124e..9ee4908 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 181769e..c442cb7 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 d0d79da..ec28918 100755
--- a/test/e2e/e2e-test/pom.xml
+++ b/test/e2e/e2e-test/pom.xml
@@ -74,4 +74,30 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven-antrun-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>download-jars</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <mkdir dir="${project.basedir}/../../jacoco"/>
+ <get dest="${project.basedir}/../../jacoco/jacocoagent.jar" src="https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar"/>
+ <get dest="${project.basedir}/../../jacoco/jacococli.jar" src="https://repo1.maven.org/maven2/org/jacoco/org.jacoco.cli/${jacoco.version}/org.jacoco.cli-${jacoco.version}-nodeps.jar"/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/test/e2e/pom.xml b/test/e2e/pom.xml
index e395998..7245949 100644
--- a/test/e2e/pom.xml
+++ b/test/e2e/pom.xml
@@ -67,10 +67,12 @@
<mysql.version>8.0.13</mysql.version>
<lombok.version>1.18.16</lombok.version>
<kafka-clients.version>2.4.1</kafka-clients.version>
+ <jacoco.version>0.8.6</jacoco.version>
<maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
+ <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
<testcontainers.version>1.15.1</testcontainers.version>
</properties>
diff --git a/test/jacoco/jacocoagent.jar b/test/jacoco/jacocoagent.jar
deleted file mode 100644
index 3d840bc..0000000
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 20ba974..0000000
Binary files a/test/jacoco/jacococli.jar and /dev/null differ
diff --git a/test/plugin/run.sh b/test/plugin/run.sh
index ba44620..5c22108 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