From 553116492d7047c76d6951431675272284e3c2c7 Mon Sep 17 00:00:00 2001 From: Andrey Babushkin Date: Wed, 13 Sep 2023 17:02:39 +0100 Subject: [PATCH] Change docker image to the one with non-root user --- .github/workflows/linux.yml | 34 +++++++++---------- .../mo/unit_tests/mo/utils/cli_parser_test.py | 2 -- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 5ade81ffa28e23..31968e18027347 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -34,7 +34,7 @@ jobs: shell: bash runs-on: aks-linux-16-cores container: - image: openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04 + image: openvinogithubactions.azurecr.io/ci/ubuntu:22.04 volumes: - /mount/caches:/mount/caches env: @@ -61,8 +61,8 @@ jobs: steps: - name: Install git run: | - apt-get update - apt-get install -y git git-lfs + sudo -E apt-get update + sudo -E apt-get install -y git git-lfs - name: Clone OpenVINO uses: actions/checkout@v4 @@ -91,9 +91,9 @@ jobs: - name: Install build dependencies run: | - bash ${OPENVINO_REPO}/install_build_dependencies.sh - apt update - apt --assume-yes install openjdk-11-jdk libbz2-dev clang unzip libpugixml-dev libtbb-dev intel-opencl-icd ocl-icd-opencl-dev opencl-headers + sudo -E ${OPENVINO_REPO}/install_build_dependencies.sh + sudo -E apt update + sudo -E apt --assume-yes install openjdk-11-jdk libbz2-dev clang unzip libpugixml-dev libtbb-dev intel-opencl-icd ocl-icd-opencl-dev opencl-headers wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip unzip ninja-linux.zip @@ -296,7 +296,7 @@ jobs: shell: bash runs-on: aks-linux-4-cores container: - image: openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04 + image: openvinogithubactions.azurecr.io/ci/ubuntu:22.04 volumes: - /mount/caches:/mount/caches env: @@ -314,8 +314,8 @@ jobs: - name: Install dependencies run: | - apt update - apt --assume-yes install openjdk-11-jdk libbz2-dev clang unzip libpugixml-dev libtbb-dev intel-opencl-icd ocl-icd-opencl-dev opencl-headers libsnappy-dev + sudo -E apt update + sudo -E apt --assume-yes install openjdk-11-jdk libbz2-dev clang unzip libpugixml-dev libtbb-dev intel-opencl-icd ocl-icd-opencl-dev opencl-headers libsnappy-dev - name: Download OpenVINO package uses: actions/download-artifact@v3 @@ -496,7 +496,7 @@ jobs: shell: bash runs-on: aks-linux-4-cores container: - image: openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04 + image: openvinogithubactions.azurecr.io/ci/ubuntu:22.04 volumes: - /mount/caches:/mount/caches env: @@ -520,8 +520,8 @@ jobs: - name: Install git run: | - apt update - apt --assume-yes install git git-lfs + sudo -E apt update + sudo -E apt --assume-yes install git git-lfs - name: Clone OpenVINO uses: actions/checkout@v4 @@ -535,8 +535,8 @@ jobs: - name: Install dependencies run: | - apt update - apt --assume-yes install openjdk-11-jdk libbz2-dev clang unzip libpugixml-dev libtbb-dev intel-opencl-icd ocl-icd-opencl-dev opencl-headers libsnappy-dev + sudo -E apt update + sudo -E apt --assume-yes install openjdk-11-jdk libbz2-dev clang unzip libpugixml-dev libtbb-dev intel-opencl-icd ocl-icd-opencl-dev opencl-headers libsnappy-dev - uses: actions/setup-python@v4 with: @@ -775,7 +775,7 @@ jobs: shell: bash runs-on: aks-linux-4-cores container: - image: openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04 + image: openvinogithubactions.azurecr.io/ci/ubuntu:22.04 volumes: - /mount/caches:/mount/caches env: @@ -790,8 +790,8 @@ jobs: - name: Install dependencies run: | - apt update - apt --assume-yes install openjdk-11-jdk libbz2-dev clang unzip libpugixml-dev libtbb-dev intel-opencl-icd ocl-icd-opencl-dev opencl-headers libsnappy-dev + sudo -E apt update + sudo -E apt --assume-yes install openjdk-11-jdk libbz2-dev clang unzip libpugixml-dev libtbb-dev intel-opencl-icd ocl-icd-opencl-dev opencl-headers libsnappy-dev - name: Download OpenVINO package uses: actions/download-artifact@v3 diff --git a/tools/mo/unit_tests/mo/utils/cli_parser_test.py b/tools/mo/unit_tests/mo/utils/cli_parser_test.py index a29cdd101dec8d..1f2cce048aba07 100644 --- a/tools/mo/unit_tests/mo/utils/cli_parser_test.py +++ b/tools/mo/unit_tests/mo/utils/cli_parser_test.py @@ -1224,13 +1224,11 @@ def test_single_writable_dir(self): self.assertEqual(__class__.WRITABLE_DIR, writable_dir(__class__.WRITABLE_DIR)) @unittest.skipIf(sys.platform.startswith("win"), "chmod() on Windows do nor support not writable dir") - @unittest.skipIf(os.getenv("GITHUB_ACTIONS") == 'true', "Ticket - 118388") def test_single_non_writable_dir(self): with self.assertRaises(Error) as cm: writable_dir(__class__.NOT_WRITABLE_DIR) @unittest.skipIf(sys.platform.startswith("win"), "chmod() on Windows do nor support not writable dir") - @unittest.skipIf(os.getenv("GITHUB_ACTIONS") == 'true', "Ticket - 118388") def test_single_non_writable_sub_dir(self): with self.assertRaises(Error) as cm: writable_dir(__class__.NOT_WRITABLE_SUB_DIR)