From 39d1869443a89025d4aacea1b1b825fc37ebb19f Mon Sep 17 00:00:00 2001 From: Daming Date: Wed, 6 Nov 2019 15:40:58 +0800 Subject: [PATCH] [test/plugin] add Jenkinsfile-Agent-Test-4 (#3787) * add Jenkinsfile-Agent-Test-4 --- Jenkinsfile-Agent-Test | 45 +++++------- Jenkinsfile-Agent-Test-2 | 66 +++++------------ Jenkinsfile-Agent-Test-3 | 66 ++++++++--------- Jenkinsfile-Agent-Test-4 | 150 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 220 insertions(+), 107 deletions(-) create mode 100755 Jenkinsfile-Agent-Test-4 diff --git a/Jenkinsfile-Agent-Test b/Jenkinsfile-Agent-Test index 7998811b7..aba811318 100755 --- a/Jenkinsfile-Agent-Test +++ b/Jenkinsfile-Agent-Test @@ -67,7 +67,7 @@ pipeline { sh './mvnw -f test/plugin/pom.xml clean package -DskipTests docker:build' } } - stage('Test Cases Report (169)') { + stage('Test Cases Report (136)') { steps { echo "Test Cases Report" } @@ -82,32 +82,15 @@ pipeline { parallel { stage('Group1') { stages { - stage('httpasyncclient 4.0-4.1.3 (7)') { + stage('apm-toolkit-trace (1)') { steps { - sh 'bash test/plugin/run.sh httpasyncclient-scenario' - } - } - stage('httpclient 4.3.x-4.5.x (14)') { - steps { - sh 'bash test/plugin/run.sh httpclient-4.3.x-scenario' + sh 'bash test/plugin/run.sh apm-toolkit-trace-scenario' } } - stage('ehcache 2.8.x-2.10.x (19)') { + stage('jetty 9.x (63)') { steps { - sh 'bash test/plugin/run.sh ehcache-2.x-scenario' - } - } - - stage('dubbo 2.7.x (4)') { - steps { - sh 'bash test/plugin/run.sh dubbo-2.7.x-scenario' - } - } - - stage('spring async 4.3.x-5.1.x (35)') { - steps { - sh 'bash test/plugin/run.sh spring-async-scenario' + sh 'bash test/plugin/run.sh jetty-scenario' } } @@ -118,19 +101,27 @@ pipeline { } } } + stage('Group2') { stages { - stage('jetty 9.x (63)') { + stage('customize (1)') { steps { - sh 'bash test/plugin/run.sh jetty-scenario' + sh 'bash test/plugin/run.sh customize-scenario' } } - stage('undertow-routing-scenario 1.3.0-2.0.27 (23)') { + + stage('postgresql 9.4.1207+ (62)') { steps { - sh 'bash test/plugin/run.sh undertow-routing-scenario' + sh 'bash test/plugin/run.sh postgresql-above9.4.1207-scenario' } } - } + + stage('canal 1.0.24-1.1.2 (5)') { + steps { + sh 'bash test/plugin/run.sh canal-scenario' + } + } + } } } } diff --git a/Jenkinsfile-Agent-Test-2 b/Jenkinsfile-Agent-Test-2 index ece91a999..fd118e659 100755 --- a/Jenkinsfile-Agent-Test-2 +++ b/Jenkinsfile-Agent-Test-2 @@ -67,7 +67,7 @@ pipeline { sh './mvnw -f test/plugin/pom.xml clean package -DskipTests docker:build' } } - stage('Test Cases Report (212)') { + stage('Test Cases Report (136)') { steps { echo "Test Cases Report" } @@ -82,21 +82,9 @@ pipeline { parallel { stage('Group1') { stages { - stage('redisson-scenario 3.x (37)') { + stage('spring 4.3.x-5.2.x (54)') { steps { - sh 'bash test/plugin/run.sh redisson-scenario' - } - } - - stage('spring-cloud-gateway 2.1.x (3)') { - steps { - sh 'bash test/plugin/run.sh gateway-scenario' - } - } - - stage('spring-webflux 2.x (18)') { - steps { - sh 'bash test/plugin/run.sh webflux-scenario' + sh 'bash test/plugin/run.sh spring-4.3.x-scenario' } } @@ -106,9 +94,19 @@ pipeline { } } - stage('spring 3.0.x (8)') { + stage('dubbo 2.7.x (4)') { steps { - sh 'bash test/plugin/run.sh spring-3.0.x-scenario' + sh 'bash test/plugin/run.sh dubbo-2.7.x-scenario' + } + } + } + } + + stage('Group2') { + stages { + stage('redisson 3.x (37)') { + steps { + sh 'bash test/plugin/run.sh redisson-scenario' } } @@ -118,41 +116,15 @@ pipeline { } } - stage('spring 4.1.x-4.2.x (20)') { + stage('spring-cloud-gateway 2.1.x (3)') { steps { - sh 'bash test/plugin/run.sh spring-4.1.x-scenario' + sh 'bash test/plugin/run.sh gateway-scenario' } } - stage('apm-toolkit-trace (1)') { + stage('elasticsearch 5.x (3)') { steps { - sh 'bash test/plugin/run.sh apm-toolkit-trace-scenario' - } - } - } - } - stage('Group2') { - stages { - stage('solrj 7.x (12)') { - steps { - sh 'bash test/plugin/run.sh solrj-7.x-scenario' - } - } - - stage('spring 4.3.x-5.2.x (54)') { - steps { - sh 'bash test/plugin/run.sh spring-4.3.x-scenario' - } - } - stage('undertow-scenario 1.3.0-2.0.27 (23)') { - steps { - sh 'bash test/plugin/run.sh undertow-scenario' - } - } - - stage('customize-scenario (1)') { - steps { - sh 'bash test/plugin/run.sh customize-scenario' + sh 'bash test/plugin/run.sh elasticsearch-5.x-scenario' } } } diff --git a/Jenkinsfile-Agent-Test-3 b/Jenkinsfile-Agent-Test-3 index a171cc250..a46dfd172 100755 --- a/Jenkinsfile-Agent-Test-3 +++ b/Jenkinsfile-Agent-Test-3 @@ -67,9 +67,9 @@ pipeline { sh './mvnw -f test/plugin/pom.xml clean package -DskipTests docker:build' } } - stage('Test Cases Report (149)') { + stage('Test Cases Report (135)') { steps { - echo "reserve." + echo "Test Cases Report" } } @@ -81,44 +81,44 @@ pipeline { } parallel { stage('Group1') { - stages { - stage('kafka 0.11.0.0-2.3.0 (16)') { - steps { - sh 'bash test/plugin/run.sh kafka-scenario' - } - } - stage('canal 1.0.24-1.1.2 (5)') { - steps { - sh 'bash test/plugin/run.sh canal-scenario' - } - } - stage('sofarpc 5.4.0-5.6.2 (23)') { - steps { - sh 'bash test/plugin/run.sh sofarpc-scenario' - } - } - stage('mongodb 3.4.0-3.11.1 (17)') { - steps { - sh 'bash test/plugin/run.sh mongodb-3.x-scenario' - } - } - stage('elasticsearch 5.x (3)') { - steps { - sh 'bash test/plugin/run.sh elasticsearch-5.x-scenario' - } - } - } - } - stage('Group2') { stages { stage('postgresql 9.2.x-9.4.x (36)') { steps { sh 'bash test/plugin/run.sh postgresql-scenario' } } - stage('postgresql-9.4.1207+ (49)') { + + stage('sofarpc 5.4.0-5.6.2 (23)') { steps { - sh 'bash test/plugin/run.sh postgresql-above9.4.1207-scenario' + sh 'bash test/plugin/run.sh sofarpc-scenario' + } + } + + stage('spring 3.0.x (8)') { + steps { + sh 'bash test/plugin/run.sh spring-3.0.x-scenario' + } + } + } + } + + stage('Group2') { + stages { + stage('spring async 4.3.x-5.1.x (35)') { + steps { + sh 'bash test/plugin/run.sh spring-async-scenario' + } + } + + 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' } } } diff --git a/Jenkinsfile-Agent-Test-4 b/Jenkinsfile-Agent-Test-4 new file mode 100755 index 000000000..5ce04d811 --- /dev/null +++ b/Jenkinsfile-Agent-Test-4 @@ -0,0 +1,150 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +pipeline { + agent { + label 'skywalking' + } + + options { + timestamps() + timeout(time: 5, unit: 'HOURS') + parallelsAlwaysFailFast() + } + + tools { + jdk 'JDK 1.8 (latest)' + } + + environment { + BUILD_NO="wl4_${BUILD_ID}" + MAVEN_OPTS = '-Dmaven.repo.local=.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g' + } + + stages { + stage('Checkout Source Code') { + steps { + sh 'bash ./test/plugin/script/systeminfo.sh' + deleteDir() + checkout scm + sh 'git submodule update --init' + } + } + + stage('Compile agent Codes') { + when { + expression { + return sh(returnStatus: true, script: 'bash tools/ci/agent-build-condition.sh') + } + } + steps { + sh './mvnw -Pagent clean package -DskipTests' + } + } + + stage('Compile plugin-test tools Codes') { + when { + expression { + return sh(returnStatus: true, script: 'bash tools/ci/agent-build-condition.sh') + } + } + steps { + sh './mvnw -f test/plugin/pom.xml clean package -DskipTests docker:build' + } + } + + stage('Test Cases Report (142)') { + steps { + echo "Test Cases Report" + } + } + + stage('Run Agent Plugin Tests') { + when { + expression { + return sh(returnStatus: true, script: 'bash tools/ci/agent-build-condition.sh') + } + } + + parallel { + stage('Group1') { + stages { + stage('undertow-routing 1.3.0-2.0.27 (23)') { + steps { + sh 'bash test/plugin/run.sh undertow-routing-scenario' + } + } + + stage('ehcache 2.8.x-2.10.x (19)') { + steps { + sh 'bash test/plugin/run.sh ehcache-2.x-scenario' + } + } + + stage('undertow 1.3.0-2.0.27 (23)') { + steps { + sh 'bash test/plugin/run.sh undertow-scenario' + } + } + } + } + + stage('Group2') { + stages { + stage('spring-webflux 2.x (18)') { + steps { + sh 'bash test/plugin/run.sh webflux-scenario' + } + } + + stage('spring 4.1.x-4.2.x (20)') { + steps { + sh 'bash test/plugin/run.sh spring-4.1.x-scenario' + } + } + + stage('solrj 7.x (12)') { + steps { + sh 'bash test/plugin/run.sh solrj-7.x-scenario' + } + } + + stage('httpclient 4.3.x-4.5.x (14)') { + steps { + sh 'bash test/plugin/run.sh httpclient-4.3.x-scenario' + } + } + + stage('httpasyncclient 4.0-4.1.3 (7)') { + steps { + sh 'bash test/plugin/run.sh httpasyncclient-scenario' + } + } + } + } + } + } + } + + post { + cleanup { + sh 'bash test/plugin/run.sh --cleanup' + deleteDir() + } + } +}