drop ubuntu20 from the tested operating systems

Makefile

@@ -44,7 +44,7 @@ JOBS ?= $(CORES_TOTAL)
 
 
 # Image on which OVMS is compiled. If DIST_OS is not set, it's also used for a release image.
-# Currently supported BASE_OS values are: ubuntu20 ubuntu22 redhat
+# Currently supported BASE_OS values are: ubuntu22 redhat
 BASE_OS ?= ubuntu22
 
 # do not change this; change versions per OS a few lines below (BASE_OS_TAG_*)!
@@ -150,21 +150,14 @@ ifeq ($(findstring ubuntu,$(BASE_OS)),ubuntu)
   ifeq ($(BASE_OS),ubuntu22)
 	BASE_OS_TAG=22.04
   endif
-  ifeq ($(BASE_OS),ubuntu20)
-	BASE_OS_TAG=20.04
-  endif
   ifeq ($(NVIDIA),1)
 	BASE_IMAGE=docker.io/nvidia/cuda:11.8.0-runtime-ubuntu$(BASE_OS_TAG)
 	BASE_IMAGE_RELEASE=$(BASE_IMAGE)
   else
 	BASE_IMAGE ?= ubuntu:$(BASE_OS_TAG)
 	BASE_IMAGE_RELEASE=$(BASE_IMAGE)
   endif
-  ifeq ($(BASE_OS_TAG),20.04)
-        OS=ubuntu20
-	INSTALL_DRIVER_VERSION ?= "22.43.24595"
-	DLDT_PACKAGE_URL ?= http://s3.toolbox.iotg.sclab.intel.com/ov-packages/l_openvino_toolkit_ubuntu20_2024.5.0.16952.d499a16453e_x86_64.tgz
-  else ifeq  ($(BASE_OS_TAG),22.04)
+  ifeq  ($(BASE_OS_TAG),22.04)
         OS=ubuntu22
 	INSTALL_DRIVER_VERSION ?= "24.26.30049"
 	DLDT_PACKAGE_URL ?= http://s3.toolbox.iotg.sclab.intel.com/ov-packages/l_openvino_toolkit_ubuntu22_2024.5.0.16952.d499a16453e_x86_64.tgz
@@ -352,11 +345,6 @@ ifeq ($(FUZZER_BUILD),1)
 	@echo "Cannot run fuzzer with redhat"; exit 1 ;
   endif
 endif
-ifeq ($(BASE_OS_TAG),20.04)
-  ifeq ($(RUN_TESTS),1)
-	@echo "On ubuntu20 run tests via make run_unit_tests"; exit 1 ;
-  endif
-endif
 ifeq ($(NVIDIA),1)
   ifeq ($(OV_USE_BINARY),1)
 	@echo "Building NVIDIA plugin requires OV built from source. To build NVIDIA plugin and OV from source make command should look like this 'NVIDIA=1 OV_USE_BINARY=0 make docker_build'"; exit 1 ;
@@ -454,11 +442,6 @@ ifeq ($(BASE_OS),redhat)
 endif
 
 release_image:
-ifeq ($(BASE_OS_TAG),20.04)
-  ifeq ($(NPU),1)
-	@echo "NPU is not supported on Ubuntu 20.04" ; exit 1
-  endif
-endif
 ifeq ($(USE_BUILDX),true)
 	$(eval BUILDX:=buildx)
 	$(eval NO_CACHE_OPTION:=--no-cache-filter release)

docs/build_from_source.md

@@ -5,7 +5,7 @@ This document gives information how to build docker images and the binary packag
 ## Prerequisites
 
 1. [Docker Engine](https://docs.docker.com/engine/)
-1. Ubuntu 20.04, Ubuntu 22.04 or RedHat 8.8 host
+1. Ubuntu 22.04 or RedHat 8.10 host
 1. make
 1. bash
 
@@ -27,7 +27,6 @@ To build the image with non default configuration, add parameters described belo
 
 Select base OS:
 - `ubuntu22` for Ubuntu 22.04 (default)
-- `ubuntu20` for Ubuntu 20.04
 - `redhat` for Red Hat UBI 8.8
 
 ```bash
@@ -44,7 +43,6 @@ Parameter used to control which GPU driver version will be installed. Supported
 | OS | Versions |
 |---|---|
 | Ubuntu22 | 23.13.26032 (default), <br />22.35.24055, <br />22.10.22597, <br />21.48.21782 |
-| Ubuntu20 | 22.43.24595 (default), <br />22.35.24055, <br />22.10.22597, <br />21.48.21782 |
 | RedHat | 22.43.24595 (default), <br />22.28.23726, <br />22.10.22597, <br />21.38.21026 |
 
 Additionally it is possible to specify custom (pre-production) drivers by providing location to NEO Runtime packages on local disk. Contact Intel representative to get the access to the pre-production drivers.  

docs/deploying_server.md

@@ -82,36 +82,9 @@ If everything is set up correctly, you will see 'zebra' prediction in the output
 
 ## Deploying Model Server on Baremetal (without container)
 It is possible to deploy Model Server outside of container.
-To deploy Model Server on baremetal, use pre-compiled binaries for Ubuntu20, Ubuntu22 or RHEL8.
+To deploy Model Server on baremetal, use pre-compiled binaries for Ubuntu22 or RHEL8.
 
 ::::{tab-set}
-:::{tab-item} Ubuntu 20.04
-:sync: ubuntu-20-04
-Build the binary:
-
-```{code} sh
-# Clone the model server repository
-git clone https://github.com/openvinotoolkit/model_server
-cd model_server
-# Build docker images (the binary is one of the artifacts)
-make docker_build BASE_OS=ubuntu20 PYTHON_DISABLE=1 RUN_TESTS=0
-# Unpack the package
-tar -xzvf dist/ubuntu20/ovms.tar.gz
-```
-Install required libraries:
-```{code} sh
-sudo apt update -y && apt install -y liblibxml2 curl
-```
-Set path to the libraries
-```{code} sh
-export LD_LIBRARY_PATH=${pwd}/ovms/lib
-```
-In case of the build with Python calculators for MediaPipe graphs (PYTHON_DISABLE=0), run also:
-```{code} sh
-export PYTHONPATH=${pwd}/ovms/lib/python
-sudo apt -y install libpython3.8
-```
-:::
 :::{tab-item} Ubuntu 22.04
 :sync: ubuntu-22-04
 Download precompiled package:

src/custom_nodes/Makefile

@@ -32,9 +32,6 @@ ifeq ($(findstring ubuntu,$(BASE_OS)),ubuntu)
   ifeq ($(BASE_OS),ubuntu22)
 	BASE_OS_TAG=22.04
   endif
-  ifeq ($(BASE_OS),ubuntu20)
-	BASE_OS_TAG=20.04
-  endif
   BASE_IMAGE ?= ubuntu:$(BASE_OS_TAG)
   DIST_OS=ubuntu
 endif

src/custom_nodes/east_ocr/README.md

@@ -18,7 +18,7 @@ make NODES=east_ocr
 ```
 It will compile the library inside a docker container and save the results in `lib/<OS>/` folder.
 
-You can also select base OS between RH 8.5 (redhat) and Ubuntu 20.04 (ubuntu) by setting `BASE_OS` environment variable.
+You can also select base OS between RH 8.10 (redhat) and Ubuntu 22.04 (ubuntu) by setting `BASE_OS` environment variable.
 ```bash
 make BASE_OS=redhat NODES=east_ocr
 ```

src/custom_nodes/face_blur/README.md

@@ -29,7 +29,7 @@ make NODES=face_blur
 ```
 It will compile the library inside a docker container and save the results in `lib/<OS>/` folder.
 
-You can also select base OS between RH 8.5 (redhat) and Ubuntu 20.04 (ubuntu) by setting `BASE_OS` environment variable.
+You can also select base OS between RH 8.10 (redhat) and Ubuntu 22.04 (ubuntu) by setting `BASE_OS` environment variable.
 ```bash
 make BASE_OS=redhat NODES=face_blur
 ```

src/custom_nodes/image_transformation/README.md

@@ -20,7 +20,7 @@ make NODES=image_transformation
 ```
 It will compile the library inside a docker container and save the results in `lib/<OS>/` folder.
 
-You can also select base OS between RH 8.5 (redhat) and Ubuntu 20.04 (ubuntu) by setting `BASE_OS` environment variable.
+You can also select base OS between RH 8.10 (redhat) and Ubuntu 22.04 (ubuntu) by setting `BASE_OS` environment variable.
 ```bash
 make BASE_OS=redhat NODES=image_transformation
 ```

src/custom_nodes/model_zoo_intel_object_detection/README.md

@@ -36,7 +36,7 @@ make NODES=model_zoo_intel_object_detection
 ```
 It will compile the library inside a docker container and save the results in `lib/<OS>/` folder.
 
-You can also select base OS between RH 8.5 (redhat) and Ubuntu 20.04 (ubuntu) by setting `BASE_OS` environment variable.
+You can also select base OS between RH 8.10 (redhat) and Ubuntu 22.04 (ubuntu) by setting `BASE_OS` environment variable.
 ```bash
 make BASE_OS=redhat NODES=model_zoo_intel_object_detection
 ```

src/example/SampleCpuExtension/Dockerfile.ubuntu

@@ -14,13 +14,13 @@
 # limitations under the License.
 #
 
-ARG BASE_IMAGE=ubuntu:20.04
+ARG BASE_IMAGE=ubuntu:22.04
 FROM $BASE_IMAGE
 
 ARG TEMP_DIR=/tmp/openvino_installer
 ARG DLDT_PACKAGE_URL
 ARG APT_OV_PACKAGE
-ARG DLDT_PACKAGE_URL=https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.2/linux/l_openvino_toolkit_ubuntu20_2022.2.0.7713.af16ea1d79a_x86_64.tgz
+ARG DLDT_PACKAGE_URL
 
 RUN apt update && apt install -y build-essential wget make python3
 

src/example/SampleCustomLoader/Dockerfile.ubuntu

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-ARG BASE_IMAGE=ubuntu:20.04
+ARG BASE_IMAGE=ubuntu:22.04
 FROM $BASE_IMAGE
 RUN apt update && apt install -y build-essential wget unzip make
 COPY Makefile /src/example/SampleCustomLoader/

src/example/SampleCustomLoader/Makefile

@@ -29,9 +29,6 @@ ifeq ($(findstring ubuntu,$(BASE_OS)),ubuntu)
   ifeq ($(BASE_OS),ubuntu22)
 	BASE_OS_TAG=22.04
   endif
-  ifeq ($(BASE_OS),ubuntu20)
-	BASE_OS_TAG=20.04
-  endif
   BASE_IMAGE ?= ubuntu:$(BASE_OS_TAG)
   DIST_OS=ubuntu
 endif

tests/sdl/whitelists.py

@@ -18,7 +18,6 @@
 
 
 class OvmsImageType(Enum):
-    UBUNTU20 = auto()
     UBUNTU22 = auto()
     UBUNTU22_GPU = auto()
     UBUNTU22_NGINX = auto()
@@ -30,10 +29,8 @@ class OvmsImageType(Enum):
 class OvmsBaseImageType(Enum):
     COMMON = "common"
     UBUNTU = "ubuntu"
-    UBUNTU20 = "ubuntu20"
     UBUNTU22 = "ubuntu22"
     UBUNTU_PYTHON = "ubuntu_python"
-    UBUNTU20_PYTHON = "ubuntu20_python"
     UBUNTU22_PYTHON = "ubuntu22_python"
     UBUNTU_GPU = "ubuntu_gpu"
     UBUNTU_NGINX = "ubuntu_nginx"
@@ -53,17 +50,13 @@ class OvmsBaseImageType(Enum):
     },
     OvmsBaseImageType.UBUNTU: {'libicuuc.so', 'libicudata.so',},
     OvmsBaseImageType.UBUNTU_PYTHON: {'libexpat.so',},
-    OvmsBaseImageType.UBUNTU20: {'librt.so',},
-    OvmsBaseImageType.UBUNTU20_PYTHON: {'libpython3.8.so', 'libutil.so',},
     OvmsBaseImageType.UBUNTU22: {'libdl.so', 'libm.so', 'libpthread.so',},
     OvmsBaseImageType.UBUNTU22_PYTHON: {'libpython3.10.so',},
     OvmsBaseImageType.REDHAT: set(),
     OvmsBaseImageType.REDHAT_PYTHON:{'libpython3.9.so', 'libutil.so',},
 }
 
 whitelisted_dynamic_libraries = {
-    OvmsImageType.UBUNTU20: {"default": dynamic_libraries[OvmsBaseImageType.COMMON] | dynamic_libraries[OvmsBaseImageType.UBUNTU] | dynamic_libraries[OvmsBaseImageType.UBUNTU20],
-                             "python": dynamic_libraries[OvmsBaseImageType.UBUNTU_PYTHON] | dynamic_libraries[OvmsBaseImageType.UBUNTU20_PYTHON]},
     OvmsImageType.UBUNTU22: {"default": dynamic_libraries[OvmsBaseImageType.COMMON] | dynamic_libraries[OvmsBaseImageType.UBUNTU] | dynamic_libraries[OvmsBaseImageType.UBUNTU22],
                              "python": dynamic_libraries[OvmsBaseImageType.UBUNTU_PYTHON] | dynamic_libraries[OvmsBaseImageType.UBUNTU22_PYTHON]},
     OvmsImageType.UBUNTU22_GPU: {"default": dynamic_libraries[OvmsBaseImageType.COMMON] | dynamic_libraries[OvmsBaseImageType.UBUNTU] | dynamic_libraries[OvmsBaseImageType.UBUNTU22],
@@ -116,14 +109,12 @@ class OvmsBaseImageType(Enum):
     },
     OvmsBaseImageType.UBUNTU: set(),
     OvmsBaseImageType.UBUNTU22: {'libopenvino_intel_npu_plugin.so',},
-    OvmsBaseImageType.UBUNTU20_PYTHON: set(),
     OvmsBaseImageType.UBUNTU22_PYTHON: set(),
     OvmsBaseImageType.REDHAT: {'libpugixml.so',},
     OvmsBaseImageType.REDHAT_PYTHON: set(),
 }
 
 whitelisted_libraries = {
-    OvmsImageType.UBUNTU20: {"default": libraries[OvmsBaseImageType.COMMON] | libraries[OvmsBaseImageType.UBUNTU]},
     OvmsImageType.UBUNTU22: {"default": libraries[OvmsBaseImageType.COMMON] | libraries[OvmsBaseImageType.UBUNTU] | libraries[OvmsBaseImageType.UBUNTU22]},
     OvmsImageType.UBUNTU22_GPU: {"default": libraries[OvmsBaseImageType.COMMON] | libraries[OvmsBaseImageType.UBUNTU] | libraries[OvmsBaseImageType.UBUNTU22]},
     OvmsImageType.UBUNTU22_NGINX: {"default": libraries[OvmsBaseImageType.COMMON] | libraries[OvmsBaseImageType.UBUNTU] | libraries[OvmsBaseImageType.UBUNTU22]},
@@ -145,18 +136,6 @@ class OvmsBaseImageType(Enum):
         'libsqlite3-0',
         'readline-common',
     },
-    OvmsBaseImageType.UBUNTU20: {
-        'libicu66',
-        'libssl1.1',
-        'tzdata',
-    },
-    OvmsBaseImageType.UBUNTU20_PYTHON: {
-        'libmpdec2',
-        'libpython3.8',
-        'libpython3.8-minimal',
-        'libpython3.8-stdlib',
-        'mime-support',
-    },
     OvmsBaseImageType.UBUNTU22: {'libicu70'},
     OvmsBaseImageType.UBUNTU22_PYTHON: {
         'libmpdec3',
@@ -218,8 +197,6 @@ class OvmsBaseImageType(Enum):
 }
 
 whitelisted_packages = {
-    OvmsImageType.UBUNTU20: {"default": packages[OvmsBaseImageType.UBUNTU] | packages[OvmsBaseImageType.UBUNTU20],
-                             "python": packages[OvmsBaseImageType.UBUNTU_PYTHON] | packages[OvmsBaseImageType.UBUNTU20_PYTHON]},
     OvmsImageType.UBUNTU22: {"default": packages[OvmsBaseImageType.UBUNTU] | packages[OvmsBaseImageType.UBUNTU22],
                              "python": packages[OvmsBaseImageType.UBUNTU_PYTHON] | packages[OvmsBaseImageType.UBUNTU22_PYTHON]},
     OvmsImageType.UBUNTU22_GPU: {"default": packages[OvmsBaseImageType.UBUNTU] | packages[OvmsBaseImageType.UBUNTU22] | packages[OvmsBaseImageType.UBUNTU_GPU],

third_party/aws-sdk-cpp/aws-sdk-cpp.bzl

@@ -33,10 +33,9 @@ def _impl(repository_ctx):
     https_proxy = repository_ctx.os.environ.get("https_proxy", "")
 
     result = repository_ctx.execute(["cat","/etc/os-release"],quiet=False)
-    ubuntu20_count = result.stdout.count("PRETTY_NAME=\"Ubuntu 20")
     ubuntu22_count = result.stdout.count("PRETTY_NAME=\"Ubuntu 22")
 
-    if ubuntu20_count == 1 or ubuntu22_count == 1:
+    if ubuntu22_count == 1:
         lib_path = "lib"
     else: # for redhat
         lib_path = "lib64"
@@ -65,7 +64,7 @@ filegroup(
 )
 
 build_release = {{"CMAKE_BUILD_TYPE": "Release"}}
-build_debug = {{"CMAKE_BUILD_TYPE": "Debug"}}
+build_debug = {{"CMAKE_BUILD_TYPE": "Debug"}} 
 cmake(
     name = "aws-sdk-cpp_cmake",
     build_args = [
@@ -74,7 +73,7 @@ cmake(
         # https://github.com/bazelbuild/rules_foreign_cc/issues/329
         # there is no elegant parallel compilation support
         "VERBOSE=1",
-        "-j 4",
+        "-j `nproc`",
     ],
     cache_entries = {{
         "BUILD_ONLY": "s3", # core builds always

third_party/opencv/install_opencv.sh

@@ -32,15 +32,15 @@ if [ "$os" == "auto" ] ; then
       os="rhel8"
     fi
     case $os in
-        rhel8|ubuntu18.04|ubuntu20.04|ubuntu21.10|ubuntu22.04) [ -z "$print" ] && echo "Detected OS: ${os}" ;;
+        rhel8|ubuntu18.04|ubuntu21.10|ubuntu22.04) [ -z "$print" ] && echo "Detected OS: ${os}" ;;
         *) echo "Unsupported OS: ${os:-detection failed}" >&2 ; exit 1 ;;
     esac
 fi
 
 #===================================================================================================
 # OpenCV installation
 
-if [ "$os" == "ubuntu20.04" ] || [ "$os" == "ubuntu22.04" ] ; then
+if [ "$os" == "ubuntu22.04" ] ; then
     export DEBIAN_FRONTEND=noninteractive
     apt update && apt install -y build-essential git cmake \
         && rm -rf /var/lib/apt/lists/*

third_party/python/python_repo.bzl

@@ -16,15 +16,11 @@
 
 def _python_repository_impl(repository_ctx):
     result = repository_ctx.execute(["cat","/etc/os-release"],quiet=False)
-    ubuntu20_count = result.stdout.count("PRETTY_NAME=\"Ubuntu 20")
     ubuntu22_count = result.stdout.count("PRETTY_NAME=\"Ubuntu 22")
 
-    if ubuntu20_count == 1 or ubuntu22_count == 1:
+    if ubuntu22_count == 1:
         lib_path = "lib/x86_64-linux-gnu"
-        if ubuntu20_count == 1:
-            version = "3.8"
-        else:
-            version = "3.10"
+        version = "3.10"
     else: # for redhat
         lib_path = "lib64"
         version = "3.9"