From 6f6c1f19360f4d6d9ff2f72ba298ebea4dcd988a Mon Sep 17 00:00:00 2001 From: huangjiafengx Date: Thu, 8 Dec 2022 13:01:58 +0800 Subject: [PATCH 1/2] Enable klocwork checking for Jenkins CI Signed-off-by: huangjiafengx --- .ci_local_test/Jenkinsfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.ci_local_test/Jenkinsfile b/.ci_local_test/Jenkinsfile index 9736d326..779e2847 100644 --- a/.ci_local_test/Jenkinsfile +++ b/.ci_local_test/Jenkinsfile @@ -26,6 +26,16 @@ pipeline { } } } + stage('Klocwork Code check') { + steps { + script { + echo 'klocwork code check' + sh script: "sudo docker cp $WORKSPACE klocwork_test:/home/intel/catkin_ws/src/ros2_openvino_toolkit", returnStatus: true + sh script: "sudo docker exec -i klocwork_test bash -c 'source ~/.bashrc && cd catkin_ws && ./klocwork_scan.sh'", returnStatus: true + } + + } + } stage('The Ros2_openvino container run') { steps { script { From d6233501f357601f5d7db6588b94cbaaf798d4f9 Mon Sep 17 00:00:00 2001 From: huangjiafengx Date: Thu, 22 Dec 2022 10:59:03 +0800 Subject: [PATCH 2/2] Fix the bug of conflict resources for Jenkins CI Signed-off-by: huangjiafengx --- .ci_local_test/Jenkinsfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.ci_local_test/Jenkinsfile b/.ci_local_test/Jenkinsfile index 779e2847..2264f86e 100644 --- a/.ci_local_test/Jenkinsfile +++ b/.ci_local_test/Jenkinsfile @@ -6,6 +6,14 @@ pipeline { Test_WORKSPACE = "/home/intel/ros2_openvino_toolkit_test" } stages { + stage('Check The Conflict') { + steps { + script { + sh script: "ssh intel@$Test_Server 'cd $Test_WORKSPACE && ./check_conflict.sh'", returnStatus: true + echo "no conflict, the task continue" + } + } + } stage('Get The env') { steps { script {