Merge branch 'master' into test/archetypes

Jenkinsfile-Agent-Test-3

@@ -67,7 +67,7 @@ pipeline {
                 sh './mvnw -f test/plugin/pom.xml clean package -DskipTests docker:build'
             }
         }
-        stage('Test Cases Report (135)') {
+        stage('Test Cases Report (119)') {
             steps {
                 echo "Test Cases Report"
             }
@@ -110,12 +110,6 @@ pipeline {
                             }
                         }
 
-                        stage('kafka 0.11.0.0-2.3.0 (16)') {
-                            steps {
-                                sh 'bash test/plugin/run.sh kafka-scenario'
-                            }
-                        }
-
                         stage('mongodb 3.4.0-3.11.1 (17)') {
                             steps {
                                 sh 'bash test/plugin/run.sh mongodb-3.x-scenario'

Jenkinsfile-Agent-Test-4

@@ -68,7 +68,7 @@ pipeline {
             }
         }
 
-        stage('Test Cases Report (142)') {
+        stage('Test Cases Report (135)') {
             steps {
                 echo "Test Cases Report"
             }
@@ -84,9 +84,9 @@ pipeline {
             parallel {
                 stage('Group1') {
                     stages {
-                        stage('undertow-routing 1.3.0-2.0.27 (23)') {
+                        stage('kafka 0.11.0.0-2.3.0 (16)') {
                             steps {
-                                sh 'bash test/plugin/run.sh undertow-routing-scenario'
+                                sh 'bash test/plugin/run.sh kafka-scenario'
                             }
                         }
 

docs/en/guides/Plugin-test.md

@@ -21,7 +21,7 @@ The test framework provides `JVM-container` and `Tomcat-container` base images.
 ### JVM-container Image Introduction
 
 [JVM-container](../../../test/plugin/containers/jvm-container) uses `openjdk:8` as the basic image.
-The test case project is required to be packaged as `project-name.zip`, including `startup.sh` and uber jar, by using `mvn package`.
+The test case project is required to be packaged as `project-name.zip`, including `startup.sh` and uber jar, by using `mvn clean package`.
 
 Take the following test projects as good examples
 * [sofarpc-scenario](../../../test/plugin/scenarios/sofarpc-scenario) as a single project case.
@@ -30,7 +30,7 @@ Take the following test projects as good examples
 ### Tomcat-container Image Introduction
 
 [Tomcat-container](../../../test/plugin/containers/tomcat-container) uses `tomcat:8.5.42-jdk8-openjdk` as the basic image.
-The test case project is required to ba packaged as `project-name.war` by using `mvn package`.
+The test case project is required to be packaged as `project-name.war` by using `mvn package`.
 
 Take the following test project as a good example
 * [spring-4.3.x-scenario](https://github.com/apache/skywalking/tree/master/test/plugin/scenarios/spring-4.3.x-scenario)
@@ -642,21 +642,19 @@ postgresql 9.2.x-9.4.x | 36 | 1243.03
 sofarpc 5.4.0-5.6.2 | 23 | 817.77
 spring 3.0.x | 8 | 231.11
 
-#### Group 2 (3138.093s)
+#### Group 2 (2433.33s)
 scenario name | versions | elapsed time (sec)
 ---|---|---
 spring async 4.3.x-5.1.x | 35 | 967.70
-kafka 0.11.0.0-2.3.0 | 16 | 704.75
 mongodb 3.4.0-3.11.1 | 17 | 1465.63
 
-
 ### Workload 4
-#### Group 1 (1688.243s)
+#### Group 1 (1778.45s)
 scenario name | versions | elapsed time (sec)
 ---|---|---
-undertow-routing 1.3.0-2.0.27 | 23 | 643.31
+kafka 0.11.0.0-2.3.0 | 16 | 704.75
 ehcache 2.8.x-2.10.x | 19 | 440.71
-undertow 1.3.0-2.0.27 | 23 | 604.20
+undertow 1.3.0-2.0.27 | 23 | 633.00
 
 #### Group 2 (2148.155s)
 scenario name | versions | elapsed time (sec)
@@ -665,4 +663,4 @@ spring-webflux 2.x | 18 | 705.60
 spring 4.1.x-4.2.x | 20 | 574.75
 solrj 7.x | 12 | 367.05
 httpclient 4.3.x-4.5.x | 14 | 300.61
-httpasyncclient 4.0-4.1.3 | 7 | 200.11
+httpasyncclient 4.0-4.1.3 | 7 | 200.11

test/plugin/run.sh

@@ -143,9 +143,9 @@ test -z "$scenario_name" && exitWithMessage "Missing value for the scenario argu
 
 if [[ ! -d ${agent_home} ]]; then
     echo "[WARN] SkyWalking Agent not exists"
-    ${mvnw} -f ${home}/../../pom.xml -Pagent -DskipTests -DBUILD_NO=${BUILD_NO:=local} clean package
+    ${mvnw} -f ${home}/../../pom.xml -Pagent -DskipTests clean package
 fi
-[[ "$force_build" == "on" ]] && ${mvnw} -f ${home}/pom.xml clean package -DskipTests docker:build
+[[ "$force_build" == "on" ]] && ${mvnw} -f ${home}/pom.xml clean package -DskipTests -DBUILD_NO=${BUILD_NO:=local} docker:build
 
 workspace="${home}/workspace/${scenario_name}"
 task_state_house="${workspace}/.states"