diff --git "a/document/DockerFile\351\205\215\347\275\256/Docker\351\225\234\345\203\217\347\224\237\346\210\220\346\211\213\345\206\214.md" "b/document/DockerFile\351\205\215\347\275\256/Docker\351\225\234\345\203\217\347\224\237\346\210\220\346\211\213\345\206\214.md" index a12f246858622019f2095e12c34944a935eecccb..9dd9cf96deb6c7b59ebf3a079a404039e5b09994 100644 --- "a/document/DockerFile\351\205\215\347\275\256/Docker\351\225\234\345\203\217\347\224\237\346\210\220\346\211\213\345\206\214.md" +++ "b/document/DockerFile\351\205\215\347\275\256/Docker\351\225\234\345\203\217\347\224\237\346\210\220\346\211\213\345\206\214.md" @@ -31,11 +31,6 @@ concurrent-ruby-1.1.10.gem ci_reporter-2.0.0.gem bundler-2.2.33.gem builder-3.2. make && \ chmod 777 /root/.local/lkp-tests/programs/compatibility-test/run && \ ln -s /root/.local/lkp-tests/programs/compatibility-test/run /root/.local/lkp-tests/tests/compatibility-test && \ - echo "LKP_PATH=/root/.local/lkp-tests/" >> /etc/profile.d/lkp.sh && \ - echo "LKP_SRC=/root/.local/lkp-tests/" >> /etc/profile.d/lkp.sh && \ - echo "PATH=/root/.local/lkp-tests/sbin:/root/.local/lkp-tests/bin:$PATH" >> /etc/profile.d/lkp.sh && \ - echo "export LKP_PATH LKP_SRC PATH" >> /etc/profile.d/lkp.sh && \ - source /etc/profile && \ cd /root/.local/lkp-tests/programs/compatibility-test/ && \ lkp split /root/.local/lkp-tests/programs/compatibility-test/jobs/compatibility-test.yaml && \ chown -R root:root /root/.local/lkp-tests diff --git "a/document/Jenkins\345\256\211\350\243\205\351\203\250\347\275\262/DevkitPerformanceAnalysis.assets/Devkit_Distribute\347\246\273\347\272\277\345\256\211\350\243\205\346\210\220\345\212\237.png" "b/document/Jenkins\345\256\211\350\243\205\351\203\250\347\275\262/DevkitPerformanceAnalysis.assets/Devkit_Distribute\347\246\273\347\272\277\345\256\211\350\243\205\346\210\220\345\212\237.png" new file mode 100644 index 0000000000000000000000000000000000000000..e2b7453dd96ce5d53f95a991c41eeb7bf6f902ed Binary files /dev/null and "b/document/Jenkins\345\256\211\350\243\205\351\203\250\347\275\262/DevkitPerformanceAnalysis.assets/Devkit_Distribute\347\246\273\347\272\277\345\256\211\350\243\205\346\210\220\345\212\237.png" differ diff --git "a/document/Jenkins\345\256\211\350\243\205\351\203\250\347\275\262/DevkitPerformanceAnalysis.assets/lkp_test\346\230\257\345\220\246\345\255\230\345\234\250\346\240\241\351\252\214.png" "b/document/Jenkins\345\256\211\350\243\205\351\203\250\347\275\262/DevkitPerformanceAnalysis.assets/lkp_test\346\230\257\345\220\246\345\255\230\345\234\250\346\240\241\351\252\214.png" new file mode 100644 index 0000000000000000000000000000000000000000..0a9744cce0d2955898874b92b4f4877de7c0e9b1 Binary files /dev/null and "b/document/Jenkins\345\256\211\350\243\205\351\203\250\347\275\262/DevkitPerformanceAnalysis.assets/lkp_test\346\230\257\345\220\246\345\255\230\345\234\250\346\240\241\351\252\214.png" differ diff --git "a/document/Jenkins\345\256\211\350\243\205\351\203\250\347\275\262/DevkitPerformanceAnalysis.assets/\344\270\213\350\275\275Devkit_Distribute.png" "b/document/Jenkins\345\256\211\350\243\205\351\203\250\347\275\262/DevkitPerformanceAnalysis.assets/\344\270\213\350\275\275Devkit_Distribute.png" new file mode 100644 index 0000000000000000000000000000000000000000..989ba8ef52a110d892bb1fe3ef57871c5057bda4 Binary files /dev/null and "b/document/Jenkins\345\256\211\350\243\205\351\203\250\347\275\262/DevkitPerformanceAnalysis.assets/\344\270\213\350\275\275Devkit_Distribute.png" differ diff --git "a/document/Jenkins\345\256\211\350\243\205\351\203\250\347\275\262/Jenkins\346\265\201\346\260\264\347\272\277\351\205\215\347\275\256Java\346\200\247\350\203\275\345\210\206\346\236\220.md" "b/document/Jenkins\345\256\211\350\243\205\351\203\250\347\275\262/Jenkins\346\265\201\346\260\264\347\272\277\351\205\215\347\275\256Java\346\200\247\350\203\275\345\210\206\346\236\220.md" index a05da456e6dfd96869f5ba740f9b3ef7eef06f29..aa14e20aec28cf8d79187f4ffa2a3c78908a0171 100644 --- "a/document/Jenkins\345\256\211\350\243\205\351\203\250\347\275\262/Jenkins\346\265\201\346\260\264\347\272\277\351\205\215\347\275\256Java\346\200\247\350\203\275\345\210\206\346\236\220.md" +++ "b/document/Jenkins\345\256\211\350\243\205\351\203\250\347\275\262/Jenkins\346\265\201\346\260\264\347\272\277\351\205\215\347\275\256Java\346\200\247\350\203\275\345\210\206\346\236\220.md" @@ -15,11 +15,12 @@ stage('Java Performance Analysis') { sudo rm -rf /home/test/report /home/test/result.html # 设置java性能采集必要的选项 sudo bash /root/.local/lkp-tests/programs/devkit_distribute/bin/generate_lkptest_config.sh -i 160.0.1.2,160.0.1.3 -u root -f /home/Jenkens/id_rsa -D 160.0.1.5 -a spring-boot -d 10 -g /home/Jenkens/spring-boot -j "sh /home/test/apache-jmeter-5.6.3/bin/jmeter.sh -nt /home/test/Test_request.jmx -l /home/test/result.html -eo /home/test/report" - source /etc/profile + # 通过lkp命令生成devkit_distribute-defaults.yaml sudo /root/.local/lkp-tests/bin/lkp split-job /root/.local/lkp-tests/programs/devkit_distribute/config/devkit_distribute.yaml + # 运行 + sudo /root/.local/lkp-tests/bin/lkp run ${CURDIR}/devkit_distribute-defaults.yaml # 判断 是否执行成功 sudo bash /root/.local/lkp-tests/programs/devkit_distribute/bin/parsing_result.sh - sudo /root/.local/lkp-tests/bin/lkp run ${CURDIR}/devkit_distribute-defaults.yaml ''' } post { @@ -56,12 +57,39 @@ stage('Java Performance Analysis') { #### 1. 安装java分发采集命令行工具到执行jenkins执行机 +##### 1.1 使用deploy_tool命令安装 + [通过devkitpipeline部署工具部署](../批量部署工具/批量部署工具devkitpipeline.md) 安装完成后查看 ![安装成功](./DevkitPerformanceAnalysis.assets/安装成功.png) +##### 1.2 离线安装 + +###### 1.2.1 确定lkp-test已经安装 + +如果没有安装，参考[lkp-test离线安装](../测试平台安装部署/devkit测试平台安装部署与jenkins集成部署指导手册.md#一-安装指导) +。以下确定lkp-test是否安装。 + +![lkp_test是否存在校验.png](DevkitPerformanceAnalysis.assets/lkp_test是否存在校验.png) + +###### 1.2.2 下载离线包，后执行以下命令 + +发行版中下载**最新**的devkit_distribute.tar.gz +![下载Devkit_Distribute](DevkitPerformanceAnalysis.assets/下载Devkit_Distribute.png) + +执行以下命令： + +```shell + tar --no-same-owner -zxf devkit_distribute.tar.gz -C "${HOME}"/.local/lkp-tests/programs + chmod 755 "${HOME}"/.local/lkp-tests/programs/devkit_distribute/bin/start.sh + ln -s "${HOME}"/.local/lkp-tests/programs/devkit_distribute/bin/start.sh "${HOME}"/.local/lkp-tests/tests/devkit_distribute +``` + +安装成功： +![Devkit_Distribute离线安装成功.png](DevkitPerformanceAnalysis.assets/Devkit_Distribute离线安装成功.png) + #### 2. 确定需要采集的java程序所在机器存在jcmd命令 ##### 2.1 检查jcmd命令是否存在 @@ -100,4 +128,3 @@ stage('Java Performance Analysis') { ##### 5.3 最终报告 ![具体报告](./DevkitPerformanceAnalysis.assets/具体报告.png) - \ No newline at end of file