From c418eeee5280a44ccffc3d37ccb4d2e6d7ae166b Mon Sep 17 00:00:00 2001 From: huangjiafengx Date: Thu, 30 Mar 2023 15:10:41 +0800 Subject: [PATCH 1/2] Enable ci for master Signed-off-by: huangjiafengx --- .ci_local_test/ros2_openvino_toolkit_test/docker_run.sh | 4 ++-- .github/workflows/basic_func_tests.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci_local_test/ros2_openvino_toolkit_test/docker_run.sh b/.ci_local_test/ros2_openvino_toolkit_test/docker_run.sh index 558203d2..1aec8fce 100755 --- a/.ci_local_test/ros2_openvino_toolkit_test/docker_run.sh +++ b/.ci_local_test/ros2_openvino_toolkit_test/docker_run.sh @@ -22,8 +22,8 @@ function run_container() { fi # Using jenkins server ros2_openvino_toolkit code instead of git clone code. cd $work_dir && sed -i '/ros2_openvino_toolkit.git/d' Dockerfile - # realsense-ros.git isn't used in CI tests. - cd $work_dir && sed -i '/realsense-ros.git/d' Dockerfile + # remove the "\" + cd $work_dir && sed -i 's#ros2_object_msgs.git \\#ros2_object_msgs.git#' Dockerfile cd $work_dir && docker build --build-arg ROS_PRE_INSTALLED_PKG=galactic-desktop --build-arg VERSION=galactic -t ros2_openvino_docker:01 . docker run -i --privileged=true --device=/dev/dri -v $work_dir/ros2_openvino_toolkit:/root/catkin_ws/src/ros2_openvino_toolkit -v /tmp/.X11-unix:/tmp/.X11-unix -v $HOME/.Xauthority:/root/.Xauthority -e GDK_SCALE -v $work_dir/test_cases:/root/test_cases --name ros2_openvino_container ros2_openvino_docker:01 bash -c "cd /root/test_cases && ./run.sh galactic" diff --git a/.github/workflows/basic_func_tests.yml b/.github/workflows/basic_func_tests.yml index fdde3063..d94a5357 100644 --- a/.github/workflows/basic_func_tests.yml +++ b/.github/workflows/basic_func_tests.yml @@ -31,6 +31,6 @@ jobs: pwd mkdir -p ../workspace_ci cp -r ${GITHUB_WORKSPACE}/.ci_local_test/ros2_openvino_toolkit_test ../workspace_ci - cp ${GITHUB_WORKSPACE}/docker/Dockerfile ../workspace_ci + \cp ${GITHUB_WORKSPACE}/docker/Dockerfile ../workspace_ci/ros2_openvino_toolkit_test/Dockerfile cp -r ${GITHUB_WORKSPACE} ../workspace_ci/ros2_openvino_toolkit_test cd ../workspace_ci/ros2_openvino_toolkit_test && ./docker_run.sh From b4468744fdbc44d3cf00908d0f9a5b640d00e2d2 Mon Sep 17 00:00:00 2001 From: huangjiafengx Date: Fri, 31 Mar 2023 14:23:34 +0800 Subject: [PATCH 2/2] Sloving the Github action CI fail. Signed-off-by: huangjiafengx --- .ci_local_test/ros2_openvino_toolkit_test/docker_run.sh | 3 ++- .../test_cases/yolov5_model_download.sh | 4 ++-- docker/Dockerfile | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci_local_test/ros2_openvino_toolkit_test/docker_run.sh b/.ci_local_test/ros2_openvino_toolkit_test/docker_run.sh index 1aec8fce..01609c5f 100755 --- a/.ci_local_test/ros2_openvino_toolkit_test/docker_run.sh +++ b/.ci_local_test/ros2_openvino_toolkit_test/docker_run.sh @@ -24,7 +24,8 @@ function run_container() { cd $work_dir && sed -i '/ros2_openvino_toolkit.git/d' Dockerfile # remove the "\" cd $work_dir && sed -i 's#ros2_object_msgs.git \\#ros2_object_msgs.git#' Dockerfile - + # add the jpg for test. + cd $work_dir && sed -i '$i COPY jpg /root/jpg' Dockerfile cd $work_dir && docker build --build-arg ROS_PRE_INSTALLED_PKG=galactic-desktop --build-arg VERSION=galactic -t ros2_openvino_docker:01 . docker run -i --privileged=true --device=/dev/dri -v $work_dir/ros2_openvino_toolkit:/root/catkin_ws/src/ros2_openvino_toolkit -v /tmp/.X11-unix:/tmp/.X11-unix -v $HOME/.Xauthority:/root/.Xauthority -e GDK_SCALE -v $work_dir/test_cases:/root/test_cases --name ros2_openvino_container ros2_openvino_docker:01 bash -c "cd /root/test_cases && ./run.sh galactic" diff --git a/.ci_local_test/ros2_openvino_toolkit_test/test_cases/yolov5_model_download.sh b/.ci_local_test/ros2_openvino_toolkit_test/test_cases/yolov5_model_download.sh index 4ad26dc0..f3e50d3b 100755 --- a/.ci_local_test/ros2_openvino_toolkit_test/test_cases/yolov5_model_download.sh +++ b/.ci_local_test/ros2_openvino_toolkit_test/test_cases/yolov5_model_download.sh @@ -25,8 +25,8 @@ cd /root/yolov5/ python3 -m venv ov_env # Create openVINO virtual environment source ov_env/bin/activate # Activate environment python -m pip install --upgrade pip # Upgrade pip -pip install openvino[onnx]==2022.1.0 # Install OpenVINO for ONNX -pip install openvino-dev[onnx]==2022.1.0 # Install OpenVINO Dev Tool for ONNX +pip install openvino[onnx]==2022.3.0 # Install OpenVINO for ONNX +pip install openvino-dev[onnx]==2022.3.0 # Install OpenVINO Dev Tool for ONNX cd /root/yolov5/model_convert diff --git a/docker/Dockerfile b/docker/Dockerfile index 57df6247..5a53d585 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -54,7 +54,6 @@ requests \ && apt-get install -y --no-install-recommends libboost-all-dev WORKDIR /usr/lib/x86_64-linux-gnu RUN pip install --upgrade pip -RUN pip install openvino-dev[tensorflow2]==2022.3 # build ros2 openvino toolkit WORKDIR /root