From 69e6ceedfae18b70c266d7f5657f428bbd6c3fce Mon Sep 17 00:00:00 2001 From: mzegla Date: Thu, 31 Aug 2023 17:36:46 +0200 Subject: [PATCH 1/3] 2023.1.0 changes --- ...le => openvino_cg_dev_2023.1.0.dockerfile} | 37 ++++++++++--------- ...> openvino_cg_runtime_2023.1.0.dockerfile} | 18 ++++----- ...le => openvino_cg_dev_2023.1.0.dockerfile} | 31 ++++++++-------- ...> openvino_cg_runtime_2023.1.0.dockerfile} | 11 +++--- ...le => openvino_cg_dev_2023.1.0.dockerfile} | 28 +++++++------- ...> openvino_cg_runtime_2023.1.0.dockerfile} | 11 +++--- templates/rhel8/common/base.dockerfile.j2 | 3 +- 7 files changed, 69 insertions(+), 70 deletions(-) rename dockerfiles/rhel8/{openvino_cg_dev_2023.0.0.dockerfile => openvino_cg_dev_2023.1.0.dockerfile} (93%) rename dockerfiles/rhel8/{openvino_cg_runtime_2023.0.0.dockerfile => openvino_cg_runtime_2023.1.0.dockerfile} (93%) rename dockerfiles/ubuntu20/{openvino_cg_dev_2023.0.0.dockerfile => openvino_cg_dev_2023.1.0.dockerfile} (94%) rename dockerfiles/ubuntu20/{openvino_cg_runtime_2023.0.0.dockerfile => openvino_cg_runtime_2023.1.0.dockerfile} (95%) rename dockerfiles/ubuntu22/{openvino_cg_dev_2023.0.0.dockerfile => openvino_cg_dev_2023.1.0.dockerfile} (94%) rename dockerfiles/ubuntu22/{openvino_cg_runtime_2023.0.0.dockerfile => openvino_cg_runtime_2023.1.0.dockerfile} (95%) diff --git a/dockerfiles/rhel8/openvino_cg_dev_2023.0.0.dockerfile b/dockerfiles/rhel8/openvino_cg_dev_2023.1.0.dockerfile similarity index 93% rename from dockerfiles/rhel8/openvino_cg_dev_2023.0.0.dockerfile rename to dockerfiles/rhel8/openvino_cg_dev_2023.1.0.dockerfile index 905fa26e..a9caac26 100644 --- a/dockerfiles/rhel8/openvino_cg_dev_2023.0.0.dockerfile +++ b/dockerfiles/rhel8/openvino_cg_dev_2023.1.0.dockerfile @@ -8,14 +8,13 @@ WORKDIR / SHELL ["/bin/bash", "-xo", "pipefail", "-c"] -# get product from URL +# get product from local archive ARG package_url ARG TEMP_DIR=/tmp/openvino_installer WORKDIR ${TEMP_DIR} -# hadolint ignore=DL3020 -ADD ${package_url} ${TEMP_DIR} +COPY ${package_url} ${TEMP_DIR} # install product by copying archive content @@ -46,7 +45,7 @@ ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/extras/opencv/lib ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV PYTHONPATH=/opt/intel/openvino/python/python3.8:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python +ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake @@ -89,12 +88,13 @@ RUN yum install -y \ RUN rm -rf /etc/pki/entitlement && rm -rf /etc/rhsm RUN python3 -m pip install --no-cache-dir numpy==1.23.1 -ARG OPENCV_BRANCH="4.7.0" - +ARG OPENCV_BRANCH="377be68d923e40900ac5526242bcf221e3f355e5" # 4.8 with a fix for building tests WORKDIR /opt/repo -RUN git clone https://github.com/opencv/opencv.git --depth 1 -b ${OPENCV_BRANCH} - +RUN git clone https://github.com/opencv/opencv.git +WORKDIR /opt/repo/opencv +RUN git checkout ${OPENCV_BRANCH} WORKDIR /opt/repo/opencv/build + # hadolint ignore=SC2046 RUN . "${INTEL_OPENVINO_DIR}"/setupvars.sh; \ cmake \ @@ -111,6 +111,7 @@ RUN . "${INTEL_OPENVINO_DIR}"/setupvars.sh; \ -D BUILD_TBB=OFF \ -D BUILD_WEBP=OFF \ -D BUILD_ZLIB=ON \ + -D BUILD_TESTS=ON \ -D WITH_1394=OFF \ -D WITH_CUDA=OFF \ -D WITH_EIGEN=OFF \ @@ -140,8 +141,8 @@ RUN . "${INTEL_OPENVINO_DIR}"/setupvars.sh; \ -D ENABLE_CXX11=ON \ -D INSTALL_PDB=ON \ -D INSTALL_TESTS=ON \ - -D INSTALL_C_EXAMPLES=ON \ - -D INSTALL_PYTHON_EXAMPLES=ON \ + -D INSTALL_C_EXAMPLES=OFF \ + -D INSTALL_PYTHON_EXAMPLES=OFF \ -D CMAKE_INSTALL_PREFIX=install \ -D OPENCV_SKIP_PKGCONFIG_GENERATION=ON \ -D OPENCV_SKIP_PYTHON_LOADER=OFF \ @@ -189,8 +190,8 @@ FROM registry.access.redhat.com/ubi8:8.7 AS ov_base LABEL name="rhel8_dev" \ maintainer="openvino_docker@intel.com" \ vendor="Intel Corporation" \ - version="2023.0.0" \ - release="2023.0.0" \ + version="2023.1.0" \ + release="2023.1.0" \ summary="Provides the latest release of Intel(R) Distribution of OpenVINO(TM) toolkit." \ description="This is the dev image for Intel(R) Distribution of OpenVINO(TM) toolkit on RHEL UBI 8" @@ -224,7 +225,8 @@ ARG INSTALL_SOURCES="no" # hadolint ignore=SC2016 RUN sed -i -e 's|https://vault.centos.org/centos/8/PowerTools/$arch/os/Packages/gflags-devel-2.1.2-6|http://mirror.centos.org/centos/8-stream/PowerTools/$arch/os/Packages/gflags-devel-2.2.2-1|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh && \ - sed -i -e 's|https://vault.centos.org/centos/8/PowerTools/$arch/os/Packages/gflags-2.1.2-6|http://mirror.centos.org/centos/8-stream/PowerTools/$arch/os/Packages/gflags-2.2.2-1|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh + sed -i -e 's|https://vault.centos.org/centos/8/PowerTools/$arch/os/Packages/gflags-2.1.2-6|http://mirror.centos.org/centos/8-stream/PowerTools/$arch/os/Packages/gflags-2.2.2-1|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh && \ + sed -i -e 's|download-ib01.fedoraproject.org|dl.fedoraproject.org|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh WORKDIR /thirdparty # hadolint ignore=DL3031, DL3033, SC2012 @@ -264,7 +266,7 @@ ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/extras/opencv/lib ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV PYTHONPATH=/opt/intel/openvino/python/python3.8:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python +ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake @@ -278,7 +280,7 @@ RUN ${PYTHON_VER} -m pip install --upgrade pip # dev package WORKDIR ${INTEL_OPENVINO_DIR} -ARG OPENVINO_WHEELS_VERSION=2023.0.0 +ARG OPENVINO_WHEELS_VERSION=2023.1.0 ARG OPENVINO_WHEELS_URL # hadolint ignore=SC2102,DL3033 RUN yum install -y cmake git && yum clean all && \ @@ -315,9 +317,8 @@ RUN yum install -y \ # build samples into ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin WORKDIR "${INTEL_OPENVINO_DIR}"/samples/cpp -RUN ./build_samples.sh -b build && \ - cp -R build/intel64/Release samples_bin && \ - rm -Rf build +RUN ./build_samples.sh -b /tmp/build -i ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin && \ + rm -Rf /tmp/build # add Model API package # hadolint ignore=DL3013 diff --git a/dockerfiles/rhel8/openvino_cg_runtime_2023.0.0.dockerfile b/dockerfiles/rhel8/openvino_cg_runtime_2023.1.0.dockerfile similarity index 93% rename from dockerfiles/rhel8/openvino_cg_runtime_2023.0.0.dockerfile rename to dockerfiles/rhel8/openvino_cg_runtime_2023.1.0.dockerfile index 265087ce..5f82a734 100644 --- a/dockerfiles/rhel8/openvino_cg_runtime_2023.0.0.dockerfile +++ b/dockerfiles/rhel8/openvino_cg_runtime_2023.1.0.dockerfile @@ -8,14 +8,13 @@ WORKDIR / SHELL ["/bin/bash", "-xo", "pipefail", "-c"] -# get product from URL +# get product from local archive ARG package_url ARG TEMP_DIR=/tmp/openvino_installer WORKDIR ${TEMP_DIR} -# hadolint ignore=DL3020 -ADD ${package_url} ${TEMP_DIR} +COPY ${package_url} ${TEMP_DIR} # install product by copying archive content @@ -46,7 +45,7 @@ ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV PYTHONPATH=/opt/intel/openvino/python/python3.8:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python +ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake @@ -66,8 +65,8 @@ FROM registry.access.redhat.com/ubi8:8.7 AS ov_base LABEL name="rhel8_runtime" \ maintainer="openvino_docker@intel.com" \ vendor="Intel Corporation" \ - version="2023.0.0" \ - release="2023.0.0" \ + version="2023.1.0" \ + release="2023.1.0" \ summary="Provides the latest release of Intel(R) Distribution of OpenVINO(TM) toolkit." \ description="This is the runtime image for Intel(R) Distribution of OpenVINO(TM) toolkit on RHEL UBI 8" @@ -98,7 +97,8 @@ ARG INSTALL_SOURCES="no" # hadolint ignore=SC2016 RUN sed -i -e 's|https://vault.centos.org/centos/8/PowerTools/$arch/os/Packages/gflags-devel-2.1.2-6|http://mirror.centos.org/centos/8-stream/PowerTools/$arch/os/Packages/gflags-devel-2.2.2-1|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh && \ - sed -i -e 's|https://vault.centos.org/centos/8/PowerTools/$arch/os/Packages/gflags-2.1.2-6|http://mirror.centos.org/centos/8-stream/PowerTools/$arch/os/Packages/gflags-2.2.2-1|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh + sed -i -e 's|https://vault.centos.org/centos/8/PowerTools/$arch/os/Packages/gflags-2.1.2-6|http://mirror.centos.org/centos/8-stream/PowerTools/$arch/os/Packages/gflags-2.2.2-1|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh && \ + sed -i -e 's|download-ib01.fedoraproject.org|dl.fedoraproject.org|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh WORKDIR /thirdparty # hadolint ignore=DL3031, DL3033, SC2012 @@ -138,7 +138,7 @@ ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV PYTHONPATH=/opt/intel/openvino/python/python3.8:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python +ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake @@ -152,7 +152,7 @@ RUN ${PYTHON_VER} -m pip install --upgrade pip # runtime package WORKDIR ${INTEL_OPENVINO_DIR} -ARG OPENVINO_WHEELS_VERSION=2023.0.0 +ARG OPENVINO_WHEELS_VERSION=2023.1.0 ARG OPENVINO_WHEELS_URL # hadolint ignore=DL3033 RUN yum install -y cmake && yum clean all && \ diff --git a/dockerfiles/ubuntu20/openvino_cg_dev_2023.0.0.dockerfile b/dockerfiles/ubuntu20/openvino_cg_dev_2023.1.0.dockerfile similarity index 94% rename from dockerfiles/ubuntu20/openvino_cg_dev_2023.0.0.dockerfile rename to dockerfiles/ubuntu20/openvino_cg_dev_2023.1.0.dockerfile index 155939b4..2ee639d8 100644 --- a/dockerfiles/ubuntu20/openvino_cg_dev_2023.0.0.dockerfile +++ b/dockerfiles/ubuntu20/openvino_cg_dev_2023.1.0.dockerfile @@ -16,13 +16,12 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* -# get product from URL +# get product from local archive ARG package_url ARG TEMP_DIR=/tmp/openvino_installer WORKDIR ${TEMP_DIR} -# hadolint ignore=DL3020 -ADD ${package_url} ${TEMP_DIR} +COPY ${package_url} ${TEMP_DIR} # install product by copying archive content ARG TEMP_DIR=/tmp/openvino_installer @@ -49,7 +48,7 @@ ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/extras/opencv/lib ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV PYTHONPATH=/opt/intel/openvino/python/python3.8:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python +ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake @@ -100,13 +99,13 @@ RUN apt-get update; \ rm -rf /var/lib/apt/lists/* RUN python3 -m pip install --no-cache-dir numpy==1.23.1 - -ARG OPENCV_BRANCH="4.7.0" - +ARG OPENCV_BRANCH="377be68d923e40900ac5526242bcf221e3f355e5" # 4.8 with a fix for building tests WORKDIR /opt/repo -RUN git clone https://github.com/opencv/opencv.git --depth 1 -b ${OPENCV_BRANCH} - +RUN git clone https://github.com/opencv/opencv.git +WORKDIR /opt/repo/opencv +RUN git checkout ${OPENCV_BRANCH} WORKDIR /opt/repo/opencv/build + # hadolint ignore=SC1091 RUN . "${INTEL_OPENVINO_DIR}"/setupvars.sh; \ cmake -G Ninja \ @@ -123,6 +122,7 @@ RUN . "${INTEL_OPENVINO_DIR}"/setupvars.sh; \ -D BUILD_TBB=OFF \ -D BUILD_WEBP=OFF \ -D BUILD_ZLIB=ON \ + -D BUILD_TESTS=ON \ -D WITH_1394=OFF \ -D WITH_CUDA=OFF \ -D WITH_EIGEN=OFF \ @@ -151,8 +151,8 @@ RUN . "${INTEL_OPENVINO_DIR}"/setupvars.sh; \ -D ENABLE_PRECOMPILED_HEADERS=OFF \ -D ENABLE_CXX11=ON \ -D INSTALL_PDB=ON \ - -D INSTALL_TESTS=ON \ - -D INSTALL_C_EXAMPLES=ON \ + -D INSTALL_TESTS=OFF \ + -D INSTALL_C_EXAMPLES=OFF \ -D INSTALL_PYTHON_EXAMPLES=OFF \ -D CMAKE_INSTALL_PREFIX=install \ -D OPENCV_SKIP_PKGCONFIG_GENERATION=ON \ @@ -267,7 +267,7 @@ ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/extras/opencv/lib ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV PYTHONPATH=/opt/intel/openvino/python/python3.8:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python +ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake @@ -281,7 +281,7 @@ RUN ${PYTHON_VER} -m pip install --upgrade pip # dev package WORKDIR ${INTEL_OPENVINO_DIR} -ARG OPENVINO_WHEELS_VERSION=2023.0.0 +ARG OPENVINO_WHEELS_VERSION=2023.1.0 ARG OPENVINO_WHEELS_URL # hadolint ignore=SC2102 RUN apt-get update && apt-get install -y --no-install-recommends cmake make git && rm -rf /var/lib/apt/lists/* && \ @@ -307,9 +307,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends opencl-headers # build samples into ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin WORKDIR ${INTEL_OPENVINO_DIR}/samples/cpp -RUN ./build_samples.sh -b build && \ - cp -R build/intel64/Release samples_bin && \ - rm -Rf build +RUN ./build_samples.sh -b /tmp/build -i ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin && \ + rm -Rf /tmp/build # add Model API package # hadolint ignore=DL3013 diff --git a/dockerfiles/ubuntu20/openvino_cg_runtime_2023.0.0.dockerfile b/dockerfiles/ubuntu20/openvino_cg_runtime_2023.1.0.dockerfile similarity index 95% rename from dockerfiles/ubuntu20/openvino_cg_runtime_2023.0.0.dockerfile rename to dockerfiles/ubuntu20/openvino_cg_runtime_2023.1.0.dockerfile index a0898ad4..c5a204f8 100644 --- a/dockerfiles/ubuntu20/openvino_cg_runtime_2023.0.0.dockerfile +++ b/dockerfiles/ubuntu20/openvino_cg_runtime_2023.1.0.dockerfile @@ -16,13 +16,12 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* -# get product from URL +# get product from local archive ARG package_url ARG TEMP_DIR=/tmp/openvino_installer WORKDIR ${TEMP_DIR} -# hadolint ignore=DL3020 -ADD ${package_url} ${TEMP_DIR} +COPY ${package_url} ${TEMP_DIR} # install product by copying archive content ARG TEMP_DIR=/tmp/openvino_installer @@ -49,7 +48,7 @@ ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV PYTHONPATH=/opt/intel/openvino/python/python3.8:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python +ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake @@ -136,7 +135,7 @@ ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV PYTHONPATH=/opt/intel/openvino/python/python3.8:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python +ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake @@ -150,7 +149,7 @@ RUN ${PYTHON_VER} -m pip install --upgrade pip # runtime package WORKDIR ${INTEL_OPENVINO_DIR} -ARG OPENVINO_WHEELS_VERSION=2023.0.0 +ARG OPENVINO_WHEELS_VERSION=2023.1.0 ARG OPENVINO_WHEELS_URL RUN apt-get update && apt-get install -y --no-install-recommends cmake make && rm -rf /var/lib/apt/lists/* && \ if [ -z "$OPENVINO_WHEELS_URL" ]; then \ diff --git a/dockerfiles/ubuntu22/openvino_cg_dev_2023.0.0.dockerfile b/dockerfiles/ubuntu22/openvino_cg_dev_2023.1.0.dockerfile similarity index 94% rename from dockerfiles/ubuntu22/openvino_cg_dev_2023.0.0.dockerfile rename to dockerfiles/ubuntu22/openvino_cg_dev_2023.1.0.dockerfile index 7fe141d5..de9822ad 100644 --- a/dockerfiles/ubuntu22/openvino_cg_dev_2023.0.0.dockerfile +++ b/dockerfiles/ubuntu22/openvino_cg_dev_2023.1.0.dockerfile @@ -16,13 +16,12 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* -# get product from URL +# get product from local archive ARG package_url ARG TEMP_DIR=/tmp/openvino_installer WORKDIR ${TEMP_DIR} -# hadolint ignore=DL3020 -ADD ${package_url} ${TEMP_DIR} +COPY ${package_url} ${TEMP_DIR} # install product by copying archive content ARG TEMP_DIR=/tmp/openvino_installer @@ -48,7 +47,7 @@ ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/extras/opencv/lib ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV PYTHONPATH=/opt/intel/openvino/python/python3.10:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python +ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake @@ -100,12 +99,13 @@ RUN apt-get update; \ RUN python3 -m pip install --no-cache-dir numpy==1.23.1 -ARG OPENCV_BRANCH="4.7.0" - +ARG OPENCV_BRANCH="377be68d923e40900ac5526242bcf221e3f355e5" # 4.8 with a fix for building tests WORKDIR /opt/repo -RUN git clone https://github.com/opencv/opencv.git --depth 1 -b ${OPENCV_BRANCH} - +RUN git clone https://github.com/opencv/opencv.git +WORKDIR /opt/repo/opencv +RUN git checkout ${OPENCV_BRANCH} WORKDIR /opt/repo/opencv/build + # hadolint ignore=SC1091 RUN . "${INTEL_OPENVINO_DIR}"/setupvars.sh; \ cmake -G Ninja \ @@ -122,6 +122,7 @@ RUN . "${INTEL_OPENVINO_DIR}"/setupvars.sh; \ -D BUILD_TBB=OFF \ -D BUILD_WEBP=OFF \ -D BUILD_ZLIB=ON \ + -D BUILD_TESTS=ON \ -D WITH_1394=OFF \ -D WITH_CUDA=OFF \ -D WITH_EIGEN=OFF \ @@ -151,7 +152,7 @@ RUN . "${INTEL_OPENVINO_DIR}"/setupvars.sh; \ -D ENABLE_CXX11=ON \ -D INSTALL_PDB=ON \ -D INSTALL_TESTS=ON \ - -D INSTALL_C_EXAMPLES=ON \ + -D INSTALL_C_EXAMPLES=OFF \ -D INSTALL_PYTHON_EXAMPLES=OFF \ -D CMAKE_INSTALL_PREFIX=install \ -D OPENCV_SKIP_PKGCONFIG_GENERATION=ON \ @@ -270,7 +271,7 @@ ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/extras/opencv/lib ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV PYTHONPATH=/opt/intel/openvino/python/python3.10:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python +ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake @@ -284,7 +285,7 @@ RUN ${PYTHON_VER} -m pip install --upgrade pip # dev package WORKDIR ${INTEL_OPENVINO_DIR} -ARG OPENVINO_WHEELS_VERSION=2023.0.0 +ARG OPENVINO_WHEELS_VERSION=2023.1.0 ARG OPENVINO_WHEELS_URL # hadolint ignore=SC2102 RUN apt-get update && apt-get install -y --no-install-recommends cmake make git && rm -rf /var/lib/apt/lists/* && \ @@ -310,9 +311,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends opencl-headers # build samples into ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin WORKDIR ${INTEL_OPENVINO_DIR}/samples/cpp -RUN ./build_samples.sh -b build && \ - cp -R build/intel64/Release samples_bin && \ - rm -Rf build +RUN ./build_samples.sh -b /tmp/build -i ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin && \ + rm -Rf /tmp/build # add Model API package # hadolint ignore=DL3013 diff --git a/dockerfiles/ubuntu22/openvino_cg_runtime_2023.0.0.dockerfile b/dockerfiles/ubuntu22/openvino_cg_runtime_2023.1.0.dockerfile similarity index 95% rename from dockerfiles/ubuntu22/openvino_cg_runtime_2023.0.0.dockerfile rename to dockerfiles/ubuntu22/openvino_cg_runtime_2023.1.0.dockerfile index 5e54512f..92c7e0e0 100644 --- a/dockerfiles/ubuntu22/openvino_cg_runtime_2023.0.0.dockerfile +++ b/dockerfiles/ubuntu22/openvino_cg_runtime_2023.1.0.dockerfile @@ -16,13 +16,12 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* -# get product from URL +# get product from local archive ARG package_url ARG TEMP_DIR=/tmp/openvino_installer WORKDIR ${TEMP_DIR} -# hadolint ignore=DL3020 -ADD ${package_url} ${TEMP_DIR} +COPY ${package_url} ${TEMP_DIR} # install product by copying archive content ARG TEMP_DIR=/tmp/openvino_installer @@ -48,7 +47,7 @@ ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV PYTHONPATH=/opt/intel/openvino/python/python3.10:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python +ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake @@ -139,7 +138,7 @@ ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV PYTHONPATH=/opt/intel/openvino/python/python3.10:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python +ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake @@ -153,7 +152,7 @@ RUN ${PYTHON_VER} -m pip install --upgrade pip # runtime package WORKDIR ${INTEL_OPENVINO_DIR} -ARG OPENVINO_WHEELS_VERSION=2023.0.0 +ARG OPENVINO_WHEELS_VERSION=2023.1.0 ARG OPENVINO_WHEELS_URL RUN apt-get update && apt-get install -y --no-install-recommends cmake make && rm -rf /var/lib/apt/lists/* && \ if [ -z "$OPENVINO_WHEELS_URL" ]; then \ diff --git a/templates/rhel8/common/base.dockerfile.j2 b/templates/rhel8/common/base.dockerfile.j2 index f53be9b7..bea6c89a 100644 --- a/templates/rhel8/common/base.dockerfile.j2 +++ b/templates/rhel8/common/base.dockerfile.j2 @@ -198,7 +198,8 @@ ARG INSTALL_SOURCES="no" # hadolint ignore=SC2016 RUN sed -i -e 's|https://vault.centos.org/centos/8/PowerTools/$arch/os/Packages/gflags-devel-2.1.2-6|http://mirror.centos.org/centos/8-stream/PowerTools/$arch/os/Packages/gflags-devel-2.2.2-1|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh && \ - sed -i -e 's|https://vault.centos.org/centos/8/PowerTools/$arch/os/Packages/gflags-2.1.2-6|http://mirror.centos.org/centos/8-stream/PowerTools/$arch/os/Packages/gflags-2.2.2-1|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh + sed -i -e 's|https://vault.centos.org/centos/8/PowerTools/$arch/os/Packages/gflags-2.1.2-6|http://mirror.centos.org/centos/8-stream/PowerTools/$arch/os/Packages/gflags-2.2.2-1|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh && \ + sed -i -e 's|download-ib01.fedoraproject.org|dl.fedoraproject.org|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh WORKDIR /thirdparty # hadolint ignore=DL3031, DL3033, SC2012 From 9d597cab5642f80efdd97c05d813b6c763e9c2f3 Mon Sep 17 00:00:00 2001 From: mzegla Date: Thu, 31 Aug 2023 18:52:12 +0200 Subject: [PATCH 2/3] enable tests on ubuntu22 --- tests/functional/demos/test_demos_linux.py | 6 +++--- tests/functional/samples/test_samples_linux.py | 2 +- .../samples/test_samples_linux_runtime.py | 2 +- tests/functional/test_base_cpu.py | 2 +- tests/functional/test_python_bindings_linux.py | 2 +- tests/functional/test_setupvars_changes.py | 2 +- tests/functional/test_tools_linux.py | 16 ++++++++-------- tests/security/test_image.py | 2 +- tests/thirdparty/test_linux_changes.py | 4 ++-- tests/thirdparty/test_linux_deps.py | 2 +- tests/thirdparty/test_package_licenses.py | 2 +- tests/thirdparty/test_pypi_changes.py | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tests/functional/demos/test_demos_linux.py b/tests/functional/demos/test_demos_linux.py index 5792850f..a3621b63 100644 --- a/tests/functional/demos/test_demos_linux.py +++ b/tests/functional/demos/test_demos_linux.py @@ -5,7 +5,7 @@ @pytest.mark.usefixtures('_is_image_os', '_is_distribution') -@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20')], indirect=True) +@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22')], indirect=True) @pytest.mark.parametrize('_is_distribution', [('custom-full')], indirect=True) class TestDemosLinuxDataDev: @pytest.mark.parametrize('omz_python_demo_path', ['action_recognition'], indirect=True) @@ -83,7 +83,7 @@ def test_action_recognition_python_hddl(self, omz_demos_lin_hddl_tester, omz_pyt @pytest.mark.usefixtures('_is_image_os', '_is_distribution') -@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) +@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) @pytest.mark.parametrize('_is_distribution', [('dev', 'custom-full')], indirect=True) class TestDemosLinux: def test_crossroad_cpp_cpu(self, omz_demos_lin_cpu_tester, install_openvino_dependencies, bash, download_picture): @@ -339,7 +339,7 @@ def test_segmentation_cpp_gpu(self, omz_demos_lin_gpu_tester, install_openvino_d @pytest.mark.usefixtures('_is_image_os', '_is_distribution') -@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) +@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) @pytest.mark.parametrize('_is_distribution', [('runtime', 'dev', 'custom-full')], indirect=True) class TestDemosLinuxRuntime: @pytest.mark.usefixtures('_python_ngraph_required') diff --git a/tests/functional/samples/test_samples_linux.py b/tests/functional/samples/test_samples_linux.py index 7af0bea6..adf84739 100644 --- a/tests/functional/samples/test_samples_linux.py +++ b/tests/functional/samples/test_samples_linux.py @@ -7,7 +7,7 @@ @pytest.mark.usefixtures('_is_image_os', '_is_distribution') -@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) +@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) @pytest.mark.parametrize('_is_distribution', [('dev', 'custom-full')], indirect=True) class TestSamplesLinux: def test_benchmark_app_cpp_cpu(self, tester, image, install_openvino_dependencies, bash, download_picture): diff --git a/tests/functional/samples/test_samples_linux_runtime.py b/tests/functional/samples/test_samples_linux_runtime.py index eff14cae..a6e715be 100644 --- a/tests/functional/samples/test_samples_linux_runtime.py +++ b/tests/functional/samples/test_samples_linux_runtime.py @@ -7,7 +7,7 @@ @pytest.mark.usefixtures('_is_image_os', '_is_distribution', '_is_package_url_specified') -@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) +@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) @pytest.mark.parametrize('_is_distribution', [('runtime')], indirect=True) class TestSamplesLinuxRuntime: @pytest.mark.xfail_log(pattern='Error: Download', diff --git a/tests/functional/test_base_cpu.py b/tests/functional/test_base_cpu.py index 19a369d8..f185d857 100644 --- a/tests/functional/test_base_cpu.py +++ b/tests/functional/test_base_cpu.py @@ -8,7 +8,7 @@ @pytest.mark.usefixtures('_is_image_os', '_is_distribution') -@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20')], indirect=True) +@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22')], indirect=True) @pytest.mark.parametrize('_is_distribution', [('base', 'custom-no-cv')], indirect=True) def test_base_cpp(tester, image): root = pathlib.Path(os.path.realpath(__name__)).parent diff --git a/tests/functional/test_python_bindings_linux.py b/tests/functional/test_python_bindings_linux.py index f532ef63..be4e0873 100644 --- a/tests/functional/test_python_bindings_linux.py +++ b/tests/functional/test_python_bindings_linux.py @@ -17,7 +17,7 @@ @pytest.mark.usefixtures('_is_image_os') -@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) +@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) class TestPythonBindingsLinux: @pytest.mark.usefixtures('_is_distribution') @pytest.mark.parametrize('_is_distribution', [('custom-full')], indirect=True) diff --git a/tests/functional/test_setupvars_changes.py b/tests/functional/test_setupvars_changes.py index 70fd70eb..ad9e7c43 100644 --- a/tests/functional/test_setupvars_changes.py +++ b/tests/functional/test_setupvars_changes.py @@ -8,7 +8,7 @@ @pytest.mark.usefixtures('_is_image_os', '_is_not_distribution') -@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) +@pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) @pytest.mark.parametrize('_is_not_distribution', [('base', 'custom-no-cv', 'custom-full')], indirect=True) class TestSetupvarsChanges: def test_setupvars_changes_linux(self, tester, image, image_os, distribution): diff --git a/tests/functional/test_tools_linux.py b/tests/functional/test_tools_linux.py index 40a1821f..929319f4 100644 --- a/tests/functional/test_tools_linux.py +++ b/tests/functional/test_tools_linux.py @@ -6,7 +6,7 @@ @pytest.mark.usefixtures('_is_image_os', '_is_distribution') class TestToolsLinux: - @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) + @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) @pytest.mark.parametrize('_is_distribution', [('dev')], indirect=True) def test_accuracy_checker(self, tester, image, bash): kwargs = {'mem_limit': '3g'} @@ -16,7 +16,7 @@ def test_accuracy_checker(self, tester, image, bash): self.test_accuracy_checker.__name__, **kwargs, ) - @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) + @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) @pytest.mark.parametrize('_is_distribution', [('dev')], indirect=True) def test_benchmark(self, tester, image, bash): kwargs = {'mem_limit': '3g'} @@ -27,7 +27,7 @@ def test_benchmark(self, tester, image, bash): ) @pytest.mark.skip(reason='cl_compiler is not present in 2022.3') - @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20')], indirect=True) + @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22')], indirect=True) @pytest.mark.parametrize('_is_distribution', [('runtime', 'dev')], indirect=True) def test_cl_compiler(self, tester, image, bash): kwargs = {'mem_limit': '3g'} @@ -39,7 +39,7 @@ def test_cl_compiler(self, tester, image, bash): ) @pytest.mark.skip(reason='compiler tool deprecated in 2023.0') - @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20')], indirect=True) + @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22')], indirect=True) @pytest.mark.parametrize('_is_distribution', [('runtime', 'dev')], indirect=True) def test_compile_tool(self, tester, image, bash): kwargs = {'mem_limit': '3g'} @@ -50,7 +50,7 @@ def test_compile_tool(self, tester, image, bash): self.test_compile_tool.__name__, **kwargs, ) - @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) + @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) @pytest.mark.parametrize('_is_distribution', [('dev')], indirect=True) def test_deployment_manager(self, tester, image, bash): kwargs = {'mem_limit': '3g'} @@ -61,7 +61,7 @@ def test_deployment_manager(self, tester, image, bash): self.test_deployment_manager.__name__, **kwargs, ) - @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) + @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) @pytest.mark.parametrize('_is_distribution', [('dev')], indirect=True) def test_mo(self, tester, image, bash): kwargs = {'mem_limit': '3g'} @@ -71,7 +71,7 @@ def test_mo(self, tester, image, bash): self.test_mo.__name__, **kwargs, ) - @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) + @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) @pytest.mark.parametrize('_is_distribution', [('dev')], indirect=True) def test_omz(self, tester, image, bash): kwargs = {'mem_limit': '3g'} @@ -86,7 +86,7 @@ def test_omz(self, tester, image, bash): self.test_omz.__name__, **kwargs, ) - @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) + @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) @pytest.mark.parametrize('_is_distribution', [('dev')], indirect=True) def test_pot(self, tester, image, bash): kwargs = {'mem_limit': '3g'} diff --git a/tests/security/test_image.py b/tests/security/test_image.py index 7357c7cd..08bc1255 100644 --- a/tests/security/test_image.py +++ b/tests/security/test_image.py @@ -40,7 +40,7 @@ def test_snyk_linux(self, image, dockerfile, snyk_image): @pytest.mark.skipif(SNYK_TOKEN == '', # noqa: S105 # nosec reason='Missing snyk token to do test. Specify it in setup.py file') @pytest.mark.usefixtures('_is_image_os') - @pytest.mark.parametrize('_is_image_os', ['ubuntu18', 'ubuntu20'], indirect=True) + @pytest.mark.parametrize('_is_image_os', ['ubuntu18', 'ubuntu20', 'ubuntu22'], indirect=True) def test_snyk_windows(self, image, dockerfile): location = pathlib.Path(__file__).parent snyk_file = location / 'snyk.exe' diff --git a/tests/thirdparty/test_linux_changes.py b/tests/thirdparty/test_linux_changes.py index b7c768ad..0522cf7b 100644 --- a/tests/thirdparty/test_linux_changes.py +++ b/tests/thirdparty/test_linux_changes.py @@ -13,7 +13,7 @@ indirect=True) class TestLinuxChanges: @pytest.mark.usefixtures('_is_image_os') - @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) + @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) def test_linux_deps_change(self, tester, image): root = pathlib.Path(os.path.realpath(__name__)).parent image_folder = image.replace('/', '_').replace(':', '_') @@ -43,7 +43,7 @@ def test_linux_deps_change(self, tester, image): @pytest.mark.save_deps @pytest.mark.usefixtures('_is_image_os') - @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) + @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) def test_save_linux_deps(self, tester, image): root = pathlib.Path(os.path.realpath(__name__)).parent image_folder = image.replace('/', '_').replace(':', '_') diff --git a/tests/thirdparty/test_linux_deps.py b/tests/thirdparty/test_linux_deps.py index 237e01a7..92706e98 100644 --- a/tests/thirdparty/test_linux_deps.py +++ b/tests/thirdparty/test_linux_deps.py @@ -11,7 +11,7 @@ @pytest.mark.parametrize('_is_not_distribution', [('base')], indirect=True) class TestLinuxDependencies: @pytest.mark.usefixtures('_is_image_os') - @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20')], indirect=True) + @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22')], indirect=True) def test_gpl_apt_deps(self, tester, image): root = pathlib.Path(os.path.realpath(__name__)).parent image_folder = image.replace('/', '_').replace(':', '_') diff --git a/tests/thirdparty/test_package_licenses.py b/tests/thirdparty/test_package_licenses.py index 5864f566..fafa684c 100644 --- a/tests/thirdparty/test_package_licenses.py +++ b/tests/thirdparty/test_package_licenses.py @@ -11,7 +11,7 @@ @pytest.mark.parametrize('_is_not_image_os', [('winserver2019', 'windows20h2')], indirect=True) class TestLicenseLinux: @pytest.mark.usefixtures('_is_image_os') - @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20')], indirect=True) + @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22')], indirect=True) def test_package_licenses(self, tester, image): root = pathlib.Path(os.path.realpath(__name__)).parent image_folder = image.replace('/', '_').replace(':', '_') diff --git a/tests/thirdparty/test_pypi_changes.py b/tests/thirdparty/test_pypi_changes.py index a8984c91..c086da2b 100644 --- a/tests/thirdparty/test_pypi_changes.py +++ b/tests/thirdparty/test_pypi_changes.py @@ -13,7 +13,7 @@ indirect=True) class TestPyPiChanges: @pytest.mark.usefixtures('_is_image_os') - @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) + @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) def test_pypi_changes_linux(self, tester, image): root = pathlib.Path(os.path.realpath(__name__)).parent image_folder = image.replace('/', '_').replace(':', '_') @@ -40,7 +40,7 @@ def test_pypi_changes_linux(self, tester, image): @pytest.mark.save_deps @pytest.mark.usefixtures('_is_image_os') - @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'rhel8')], indirect=True) + @pytest.mark.parametrize('_is_image_os', [('ubuntu18', 'ubuntu20', 'ubuntu22', 'rhel8')], indirect=True) def test_save_pypi_deps_linux(self, tester, image): root = pathlib.Path(os.path.realpath(__name__)).parent image_folder = image.replace('/', '_').replace(':', '_') From 85591bbbb5c6bd738a9d05e869a7316f5c6deb7f Mon Sep 17 00:00:00 2001 From: "Trawinski, Dariusz" Date: Mon, 18 Sep 2023 11:07:44 +0200 Subject: [PATCH 3/3] add public 2023.1.0 packages (#286) --- utils/loader.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/utils/loader.py b/utils/loader.py index db3b9bfc..2f93435e 100644 --- a/utils/loader.py +++ b/utils/loader.py @@ -455,6 +455,29 @@ 'linux/l_openvino_toolkit_rhel8_2023.0.0.10926.b4452d56304_x86_64.tgz', }, }, + '2023.1.0': { + 'ubuntu22': + { + 'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.1/' + 'linux/l_openvino_toolkit_ubuntu22_2023.1.0.12185.47b736f63ed_x86_64.tgz', + 'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.1/' + 'linux/l_openvino_toolkit_ubuntu22_2023.1.0.12185.47b736f63ed_x86_64.tgz', + }, + 'ubuntu20': + { + 'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.1/' + 'linux/l_openvino_toolkit_ubuntu20_2023.1.0.12185.47b736f63ed_x86_64.tgz', + 'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.1/' + 'linux/l_openvino_toolkit_ubuntu20_2023.1.0.12185.47b736f63ed_x86_64.tgz', + }, + 'rhel8': + { + 'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.1/' + 'linux/l_openvino_toolkit_rhel8_2023.1.0.12185.47b736f63ed_x86_64.tgz', + 'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.1/' + 'linux/l_openvino_toolkit_rhel8_2023.1.0.12185.47b736f63ed_x86_64.tgz', + }, + }, } DIVE_URL = { 'windows': 'https://github.com/wagoodman/dive/releases/download/v0.9.2/dive_0.9.2_windows_amd64.zip',