You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2023/01/16 02:25:06 UTC
[skywalking-java] 01/01: Add Spring 6 to test case
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch test/ci/spring6
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit 142cc8a82ee4f8d3573d8a683f18bd5ad86a81b9
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Mon Jan 16 10:24:56 2023 +0800
Add Spring 6 to test case
---
.github/actions/run/action.yml | 2 +-
.github/workflows/plugins-test.3.yaml | 52 ----------------------
.../tomcat-container/src/main/docker/catalina.sh | 2 +-
.../plugin/scenarios/spring-4.3.x-scenario/pom.xml | 5 +++
.../spring-4.3.x-scenario/support-version.list | 1 +
5 files changed, 8 insertions(+), 54 deletions(-)
diff --git a/.github/actions/run/action.yml b/.github/actions/run/action.yml
index 57b711de0a..28f72df800 100644
--- a/.github/actions/run/action.yml
+++ b/.github/actions/run/action.yml
@@ -51,5 +51,5 @@ runs:
shell: bash
run: |
echo "::group::Run Plugin Test ${{ inputs.test_case }}"
- bash test/plugin/run.sh --image_version=${{ inputs.java_version }}-1.0.0 ${{ inputs.test_case }}
+ bash test/plugin/run.sh ${{ inputs.test_case }}
echo "::endgroup::"
diff --git a/.github/workflows/plugins-test.3.yaml b/.github/workflows/plugins-test.3.yaml
index 0a8cdab1d9..7ced716aab 100644
--- a/.github/workflows/plugins-test.3.yaml
+++ b/.github/workflows/plugins-test.3.yaml
@@ -55,59 +55,7 @@ jobs:
strategy:
matrix:
case:
- - mysql-scenario
- - undertow-scenario
- - webflux-scenario
- - zookeeper-scenario
- - spring-3.1.x-scenario
- - spring-4.1.x-scenario
- spring-4.3.x-scenario
- - spring-async-scenario
- - vertx-core-4.x-scenario
- - vertx-eventbus-3.x-scenario
- - vertx-web-3.54minus-scenario
- - vertx-web-3.6plus-scenario
- - mariadb-scenario
- - micronaut-http-scenario
- - nats-2.14.x-2.15.x-scenario
- - quasar-scenario
- - baidu-brpc-scenario
- - baidu-brpc-3.x-scenario
- - retransform-class-scenario
- - retransform-class-tomcat-scenario
- - graphql-8.x-scenario
- - graphql-9.x-scenario
- - graphql-16plus-scenario
- - graphql-12.x-15.x-scenario
- - hbase-scenario
- - spring-kafka-1.3.x-scenario
- - spring-kafka-2.2.x-scenario
- - spring-kafka-2.3.x-scenario
- - spring-scheduled-scenario
- - elasticjob-2.x-scenario
- - quartz-scheduler-2.x-scenario
- - xxl-job-2.2.0-scenario
- - xxl-job-2.3.x-scenario
- - thrift-scenario
- - dbcp-2.x-scenario
- - jsonrpc4j-1.x-scenario
- - gateway-3.x-scenario
- - neo4j-4.x-scenario
- - oracle-scenario
- - druid-1.x-scenario
- - hikaricp-scenario
- - clickhouse-0.3.x-scenario
- - kylin-jdbc-2.6.x-3.x-4.x-scenario
- - undertow-worker-thread-pool-scenario
- - tomcat-thread-pool-scenario
- - guava-eventbus-scenario
- - shenyu-2.4.x-scenario
- - jdk-threadpool-scenario
- - shenyu-2.4.x-dubbo-scenario
- - grpc-generic-call-scenario
- - shenyu-2.4.x-grpc-scenario
- - shenyu-2.4.x-sofarpc-scenario
- - impala-jdbc-2.6.x-scenario
steps:
- uses: actions/checkout@v2
with:
diff --git a/test/plugin/containers/tomcat-container/src/main/docker/catalina.sh b/test/plugin/containers/tomcat-container/src/main/docker/catalina.sh
index 188d15eba9..416c41a8bb 100644
--- a/test/plugin/containers/tomcat-container/src/main/docker/catalina.sh
+++ b/test/plugin/containers/tomcat-container/src/main/docker/catalina.sh
@@ -119,7 +119,7 @@ if [ -f "${AGENT_FILE_PATH}/skywalking-agent.jar" ]; then
-Dskywalking.agent.authentication=test-token
-Dskywalking.meter.report_interval=1
-Dskywalking.logging.dir=${LOGS_HOME}
- -Xms256m -Xmx256m -XX:PermSize=64M -XX:MaxPermSize=64"
+ -Xms256m -Xmx256m"
fi
# OS specific support. $var _must_ be set to either true or false.
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/pom.xml b/test/plugin/scenarios/spring-4.3.x-scenario/pom.xml
index e42f589827..7b4e7bdc0b 100644
--- a/test/plugin/scenarios/spring-4.3.x-scenario/pom.xml
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/pom.xml
@@ -98,6 +98,11 @@
<build>
<finalName>spring-4.3.x-scenario</finalName>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/support-version.list b/test/plugin/scenarios/spring-4.3.x-scenario/support-version.list
index 48d635b044..a6b3396848 100644
--- a/test/plugin/scenarios/spring-4.3.x-scenario/support-version.list
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/support-version.list
@@ -20,3 +20,4 @@
5.0.15.RELEASE
5.1.10.RELEASE
5.2.0.RELEASE
+6.0.0