[skywalking] branch master updated (7e7ab42 -> 7215323)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from 7e7ab42  [test/plugin] immigrate spring async scenario (#3611)
     add 7215323  [test/plugin]support plugin testcases run in docker-compose (#3612)

No new revisions were added by this update.

Summary of changes:
 Jenkinsfile-Agent-Test                             |   8 +-
 Jenkinsfile-Agent-Test => Jenkinsfile-Agent-Test-2 |  30 +---
 Jenkinsfile-E2E                                    |   2 +-
 test/plugin/containers/jvm-container/docker/run.sh |   3 +-
 test/plugin/pom.xml                                |   2 +-
 test/plugin/run.sh                                 |  10 +-
 test/plugin/{runner => runner-helper}/pom.xml      |   6 +-
 .../test/helper/AbstractRunningGenerator.java      |   0
 .../plugin/test/helper/ConfigurationImpl.java      |   8 +-
 .../helper/DockerComposeRunningGenerator.java}     |  60 +++++--
 .../helper/DockerContainerRunningGenerator.java    |   0
 .../plugin/test/helper/IConfiguration.java         |   1 +
 .../apache/skywalking/plugin/test/helper/Main.java |   0
 .../skywalking/plugin/test/helper/RunningType.java |   0
 .../helper/ScenarioRunningScriptGenerator.java     |   0
 .../exception/ConfigureFileNotFoundException.java  |   0
 .../exception/GenerateAdditionFileException.java   |   0
 .../helper/exception/GenerateFailedException.java  |   0
 .../plugin/test/helper/util/StringUtils.java       |   0
 .../plugin/test/helper/vo/CaseConfiguration.java   |  44 +++--
 .../plugin/test/helper/vo/DependencyComponent.java |  64 +++++---
 .../plugin/test/helper/vo/DockerService.java       |  83 +++++-----
 .../main/resources/compose-start-script.template   |  30 ++--
 .../main/resources/container-start-script.template |   0
 .../src/main/resources/docker-compose.template     |  58 +++++--
 .../src/main/resources/log4j2.xml                  |   0
 .../src/main/resources/scenario.sh                 |   0
 .../DockerComposeV2RunningGeneratorTest.java       |  67 ++++++++
 .../DockerContainerRunningGeneratorTest.java       |   0
 .../test/helper/vo/CaseIConfigurationTest.java     |   3 +-
 .../src/test/resources/configuration-test.yml      |  17 +-
 .../src/test/resources/docker-compose-test.yml     |   0
 .../src/test/resources/scenario.sh                 |   0
 .../test/helper/DockerComposeRunningGenerator.java | 113 -------------
 .../plugin/test/helper/vo/DockerCompose.java       |  40 -----
 .../plugin/test/helper/vo/DockerServiceReader.java |  26 ---
 .../helper/DockerComposeRunningGeneratorTest.java  |  82 ----------
 .../DockerComposeV2RunningGeneratorTest.java       |  87 ----------
 .../plugin/test/helper/vo/DockerComposeTest.java   |  87 ----------
 .../test/resources/container-start-script.template |  29 ----
 .../src/test/resources/docker-compose.template     |  58 -------
 .../scenarios/solrj-7.x-scenario/bin/startup.sh    |   9 +-
 .../solrj-7.x-scenario/config/expectedData.yaml    | 181 +++++++++++++++++++++
 .../solrj-7.x-scenario/configuration.yml}          |  19 ++-
 .../pom.xml                                        |  78 ++++-----
 .../src/main/assembly/assembly.xml                 |   4 +-
 .../apm/testcase/solrj/Application.java}           |  18 +-
 .../testcase/solrj/controller/CaseController.java  | 123 ++++++++++++++
 .../src/main/resources/application.yml}            |   8 +-
 .../src/main/resources/log4j2.xml                  |   9 +-
 .../support-version.list                           |  23 +--
 51 files changed, 692 insertions(+), 798 deletions(-)
 copy Jenkinsfile-Agent-Test => Jenkinsfile-Agent-Test-2 (69%)
 rename test/plugin/{runner => runner-helper}/pom.xml (96%)
 rename test/plugin/{runner => runner-helper}/src/main/java/org/apache/skywalking/plugin/test/helper/AbstractRunningGenerator.java (100%)
 rename test/plugin/{runner => runner-helper}/src/main/java/org/apache/skywalking/plugin/test/helper/ConfigurationImpl.java (97%)
 rename test/plugin/{runner/src/main/java/org/apache/skywalking/plugin/test/helper/DockerComposeV2RunningGenerator.java => runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerComposeRunningGenerator.java} (62%)
 rename test/plugin/{runner => runner-helper}/src/main/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGenerator.java (100%)
 rename test/plugin/{runner => runner-helper}/src/main/java/org/apache/skywalking/plugin/test/helper/IConfiguration.java (99%)
 rename test/plugin/{runner => runner-helper}/src/main/java/org/apache/skywalking/plugin/test/helper/Main.java (100%)
 rename test/plugin/{runner => runner-helper}/src/main/java/org/apache/skywalking/plugin/test/helper/RunningType.java (100%)
 rename test/plugin/{runner => runner-helper}/src/main/java/org/apache/skywalking/plugin/test/helper/ScenarioRunningScriptGenerator.java (100%)
 rename test/plugin/{runner => runner-helper}/src/main/java/org/apache/skywalking/plugin/test/helper/exception/ConfigureFileNotFoundException.java (100%)
 rename test/plugin/{runner => runner-helper}/src/main/java/org/apache/skywalking/plugin/test/helper/exception/GenerateAdditionFileException.java (100%)
 rename test/plugin/{runner => runner-helper}/src/main/java/org/apache/skywalking/plugin/test/helper/exception/GenerateFailedException.java (100%)
 rename test/plugin/{runner => runner-helper}/src/main/java/org/apache/skywalking/plugin/test/helper/util/StringUtils.java (100%)
 rename test/plugin/{runner => runner-helper}/src/main/java/org/apache/skywalking/plugin/test/helper/vo/CaseConfiguration.java (80%)
 rename test/plugin/{runner => runner-helper}/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DependencyComponent.java (70%)
 rename test/plugin/{runner => runner-helper}/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DockerService.java (54%)
 copy apm-commons/apm-datacarrier/pom.xml => test/plugin/runner-helper/src/main/resources/compose-start-script.template (60%)
 rename test/plugin/{runner => runner-helper}/src/main/resources/container-start-script.template (100%)
 rename test/plugin/{runner => runner-helper}/src/main/resources/docker-compose.template (53%)
 rename test/plugin/{runner => runner-helper}/src/main/resources/log4j2.xml (100%)
 rename test/plugin/{runner => runner-helper}/src/main/resources/scenario.sh (100%)
 create mode 100644 test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerComposeV2RunningGeneratorTest.java
 rename test/plugin/{runner => runner-helper}/src/test/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGeneratorTest.java (100%)
 rename test/plugin/{runner => runner-helper}/src/test/java/org/apache/skywalking/plugin/test/helper/vo/CaseIConfigurationTest.java (92%)
 copy test/plugin/{runner => runner-helper}/src/test/resources/configuration-test.yml (73%)
 rename test/plugin/{runner => runner-helper}/src/test/resources/docker-compose-test.yml (100%)
 rename test/plugin/{runner => runner-helper}/src/test/resources/scenario.sh (100%)
 delete mode 100644 test/plugin/runner/src/main/java/org/apache/skywalking/plugin/test/helper/DockerComposeRunningGenerator.java
 delete mode 100644 test/plugin/runner/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DockerCompose.java
 delete mode 100644 test/plugin/runner/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DockerServiceReader.java
 delete mode 100644 test/plugin/runner/src/test/java/org/apache/skywalking/plugin/test/helper/DockerComposeRunningGeneratorTest.java
 delete mode 100644 test/plugin/runner/src/test/java/org/apache/skywalking/plugin/test/helper/DockerComposeV2RunningGeneratorTest.java
 delete mode 100644 test/plugin/runner/src/test/java/org/apache/skywalking/plugin/test/helper/vo/DockerComposeTest.java
 delete mode 100644 test/plugin/runner/src/test/resources/container-start-script.template
 delete mode 100644 test/plugin/runner/src/test/resources/docker-compose.template
 copy docs/en/setup/envoy/examples/metrics/Makefile => test/plugin/scenarios/solrj-7.x-scenario/bin/startup.sh (87%)
 create mode 100644 test/plugin/scenarios/solrj-7.x-scenario/config/expectedData.yaml
 rename test/plugin/{runner/src/test/resources/configuration-test.yml => scenarios/solrj-7.x-scenario/configuration.yml} (72%)
 copy test/plugin/scenarios/{dubbo-2.5.x-scenario => solrj-7.x-scenario}/pom.xml (71%)
 copy test/plugin/scenarios/{dubbo-2.5.x-scenario => solrj-7.x-scenario}/src/main/assembly/assembly.xml (94%)
 copy test/{e2e/e2e-cluster/consumer/src/main/java/org/apache/skywalking/e2e/cluster/Service1Application.java => plugin/scenarios/solrj-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/solrj/Application.java} (77%)
 create mode 100644 test/plugin/scenarios/solrj-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/solrj/controller/CaseController.java
 copy test/plugin/scenarios/{dubbo-2.7.x-scenario/support-version.list => solrj-7.x-scenario/src/main/resources/application.yml} (93%)
 copy test/plugin/scenarios/{jetty-scenario/jettyclient-scenario => solrj-7.x-scenario}/src/main/resources/log4j2.xml (89%)
 copy test/plugin/scenarios/{dubbo-2.5.x-scenario => solrj-7.x-scenario}/support-version.list (91%)