Skip to content

Commit 8931f9b

Browse files
authored
Remove unnecessary artifacts from release images(#3182)
Those libs are not required to run ovms, but intermediate product of targets
1 parent e18d204 commit 8931f9b

File tree

5 files changed

+19
-17
lines changed

5 files changed

+19
-17
lines changed

ci/build_test_OnCommit.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pipeline {
2929
} else { // branches without PR - check changes in last commit
3030
git_diff = sh (script: "git diff --name-only HEAD^..HEAD", returnStdout: true).trim()
3131
}
32-
def matched = (git_diff =~ /src|export_models|third_party|external|(\n|^)Dockerfile|(\n|^)Makefile|\.c|\.h|\.bazel|\.bzl|\.groovy|BUILD|WORKSPACE|(\n|^)run_unit_tests\.sh/)
32+
def matched = (git_diff =~ /src|export_models|third_party|external|(\n|^)Dockerfile|(\n|^)Makefile|\.c|\.h|\.bazel|\.bzl|\.groovy|BUILD|create_package\.sh|WORKSPACE|(\n|^)run_unit_tests\.sh/)
3333
if (matched){
3434
image_build_needed = "true"
3535
}

create_package.sh

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,24 @@ find /ovms/bazel-out/k8-*/bin -iname '*.so*' ! -type d ! -name "libgtest.so" ! -
2727
mv /ovms_release/lib/libcustom_node* /ovms_release/lib/custom_nodes/
2828
cd /ovms_release/lib/ ; rm -f libazurestorage.so.* ; ln -s libazurestorage.so libazurestorage.so.7 ;ln -s libazurestorage.so libazurestorage.so.7.5
2929
cd /ovms_release/lib/ ; rm -f libcpprest.so.2.10 ; ln -s libcpprest.so libcpprest.so.2.10
30+
3031
if [ -f /ovms_release/lib/libopenvino_genai.so ]; then cd /ovms_release/lib/ ; rm -f libopenvino_genai.so.* ; ln -s libopenvino_genai.so libopenvino_genai.so.2520 ; ln -s libopenvino_genai.so.2025.2.0.0 libopenvino_genai.so.2520 ; fi
31-
if [ -f /ovms_release/lib/libopenvino_genai_c.so ]; then cd /ovms_release/lib/ ; rm -f libopenvino_genai_c.so.* ; ln -s libopenvino_genai_c.so libopenvino_genai_c.so.2520 ; ln -s libopenvino_genai_c.so.2025.2.0.0 libopenvino_genai_c.so.2520 ; fi
32-
rm -f /ovms_release/lib/libssl.so
32+
if [ -f /ovms_release/lib/libopenvino_genai_c.so ]; then cd /ovms_release/lib/ ; rm -f libopenvino_genai_c.so* ; fi
33+
34+
# Remove GPU plugin for CPU images?
35+
# Remove OpenCL for CPU images?
36+
37+
rm -rf \
38+
/ovms_release/lib/libssl.so \
39+
/ovms_release/lib/libexternal_Szlib_Slibzlib.so \
40+
/ovms_release/lib/py_openvino_genai.cpython-312-x86_64-linux-gnu.so \
41+
/ovms_release/lib/libinference_calculator_cc_proto.so \
42+
/ovms_release/lib/libzlib.so \
43+
/ovms_release/lib/libface_detection_cc_proto.so.so \
44+
/ovms_release/lib/_crypt.cpython-312-x86_64-linux-gnu.so \
45+
/ovms_release/lib/libface_detection_options_registry.so \
46+
/ovms_release/lib/libinference_calculator_options_registry.so
47+
3348

3449
# Remove coverage libraries
3550
if [ -f /ovms_release/lib/libjava.so ] ; then cd /ovms_release/lib/ && \
@@ -55,7 +70,6 @@ if [ -d /opt/intel/openvino/runtime/3rdparty ] ; then find /opt/intel/openvino/r
5570
if [[ $debug_bazel_flags == *"--copt=-g -c dbg"* ]]; then find /opt/intel/openvino/runtime/3rdparty/ -iname '*libtbb_debug*' -exec cp -vP {} /ovms_release/lib/ \;; fi
5671
find /opt/opencv/lib/ -iname '*.so*' -exec cp -vP {} /ovms_release/lib/ \;
5772
cp /opt/opencv/share/licenses/opencv4/* /ovms/release_files/thirdparty-licenses/
58-
if [ "$BASE_OS" == "redhat" ] ; then cp -P /usr/lib64/libpugixml.so* /ovms_release/lib/ ; fi
5973
if [ "$BASE_OS" == "redhat" ] ; then cp -P /usr/lib64/libOpenCL.so* /ovms_release/lib/ ; fi
6074
if [[ "$BASE_OS" =~ "ubuntu" ]] ; then cp -P /usr/lib/x86_64-linux-gnu/libOpenCL.so* /ovms_release/lib/ ; fi
6175

tests/file_lists/lib_files.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ libazurestorage.so.7->libazurestorage.so
55
libazurestorage.so.7.5->libazurestorage.so
66
libcpprest.so
77
libcpprest.so.2.10->libcpprest.so
8-
libface_detection_cc_proto.so
9-
libface_detection_options_registry.so
10-
libinference_calculator_cc_proto.so
11-
libinference_calculator_options_registry.so
128
libopencv_calib3d.so->libopencv_calib3d.so.410
139
libopencv_calib3d.so.4.10.0
1410
libopencv_calib3d.so.410->libopencv_calib3d.so.4.10.0

tests/file_lists/lib_files_python.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ libazurestorage.so.7->libazurestorage.so
55
libazurestorage.so.7.5->libazurestorage.so
66
libcpprest.so
77
libcpprest.so.2.10->libcpprest.so
8-
libface_detection_cc_proto.so
9-
libface_detection_options_registry.so
10-
libinference_calculator_cc_proto.so
11-
libinference_calculator_options_registry.so
128
libopencv_calib3d.so->libopencv_calib3d.so.410
139
libopencv_calib3d.so.4.10.0
1410
libopencv_calib3d.so.410->libopencv_calib3d.so.4.10.0

tests/sdl/whitelists.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,6 @@ class OvmsBaseImageType(Enum):
9494
OvmsBaseImageType.COMMON: {
9595
'libazurestorage.so',
9696
'libcpprest.so',
97-
'libface_detection_cc_proto.so',
98-
'libface_detection_options_registry.so',
99-
'libinference_calculator_cc_proto.so',
100-
'libinference_calculator_options_registry.so',
10197
'libOpenCL.so',
10298
'libopencv_calib3d.so',
10399
'libopencv_core.so',
@@ -133,7 +129,7 @@ class OvmsBaseImageType(Enum):
133129
OvmsBaseImageType.UBUNTU20_PYTHON: set(),
134130
OvmsBaseImageType.UBUNTU22_PYTHON: set(),
135131
OvmsBaseImageType.UBUNTU24_PYTHON: set(),
136-
OvmsBaseImageType.REDHAT: {'libpugixml.so',},
132+
OvmsBaseImageType.REDHAT: set(),
137133
OvmsBaseImageType.REDHAT_PYTHON: set(),
138134
}
139135

0 commit comments

Comments
 (0)