env managing refactored

openvinotoolkit · Dec 12, 2024 · 6f87ddc · 6f87ddc
1 parent 8f193b0
commit 6f87ddc
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 22 deletions.
diff --git a/.github/dockerfiles/ov_build/ubuntu_22_04_riscv/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_22_04_riscv/Dockerfile
@@ -10,7 +10,27 @@ RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf && \
     echo 'APT::Get::no-install-recommends "true";' >> /etc/apt/apt.conf
 
 ENV DEBIAN_FRONTEND="noninteractive" \
-    TZ="Europe/London"
+    TZ="Europe/London" \
+    CMAKE_BUILD_TYPE="Release" \
+    CMAKE_GENERATOR="Ninja Multi-Config" \
+    CMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    CMAKE_C_COMPILER_LAUNCHER=ccache \
+    SCCACHE_IGNORE_SERVER_IO_ERROR=1 \
+    SCCACHE_SERVER_PORT=35555 \
+    SCCACHE_ERROR_LOG=/__w/openvino/sccache_log.txt \
+    SCCACHE_LOG=warn \
+    GITHUB_WORKSPACE="/__w/openvino/openvino" \
+    OPENVINO_REPO=/__w/openvino/openvino/openvino \
+    INSTALL_DIR=/__w/openvino/openvino/openvino_install \
+    INSTALL_TEST_DIR=/__w/openvino/openvino/tests_install \
+    BUILD_DIR=/__w/openvino/openvino/openvino_build \
+    SCCACHE_AZURE_KEY_PREFIX=ubuntu20_x86_64_Release \
+    XUANTIE_DIR=/__w/openvino/xuantie \
+    CCACHE_DIR=/__w/openvino/openvino/ccache \
+    CCACHE_TEMPDIR=/__w/openvino/openvino/ccache_temp \
+    CCACHE_MAXSIZE=2G \
+    XUANTIE_BIN_PATH=/mount/testdata1/ \
+    XUANTIE_TAR_NAME="Xuantie-900-gcc-linux-5.15.0-glibc-x86_64-V2.8.1"
 
 RUN apt-get update && \
     apt-get install software-properties-common && \

diff --git a/.github/workflows/dev_cpu_linux_riscv.yml b/.github/workflows/dev_cpu_linux_riscv.yml
@@ -73,28 +73,7 @@ jobs:
       volumes:
         - /mount:/mount
     env:
-      DEBIAN_FRONTEND: noninteractive # to prevent apt-get from waiting user input
-      CMAKE_BUILD_TYPE: 'Release'
-      CMAKE_GENERATOR: 'Ninja Multi-Config'
-      CMAKE_CXX_COMPILER_LAUNCHER: ccache
-      CMAKE_C_COMPILER_LAUNCHER: ccache
-      SCCACHE_IGNORE_SERVER_IO_ERROR: 1
-      SCCACHE_SERVER_PORT: 35555
-      SCCACHE_ERROR_LOG: /__w/openvino/sccache_log.txt
-      SCCACHE_LOG: warn
-      GITHUB_WORKSPACE: '/__w/openvino/openvino'
-      OPENVINO_REPO: /__w/openvino/openvino/openvino
-      INSTALL_DIR: /__w/openvino/openvino/openvino_install
-      INSTALL_TEST_DIR: /__w/openvino/openvino/tests_install
-      BUILD_DIR: /__w/openvino/openvino/openvino_build
-      SCCACHE_AZURE_KEY_PREFIX: ubuntu20_x86_64_Release
-      XUANTIE_DIR: /__w/openvino/xuantie
       CCACHE_REMOTE_DIR: /mount/caches/ccache/ubuntu22_riscv64/${{ github.base_ref || github.ref_name }}
-      CCACHE_DIR: /__w/openvino/openvino/ccache
-      CCACHE_TEMPDIR: /__w/openvino/openvino/ccache_temp
-      CCACHE_MAXSIZE: 2G
-      XUANTIE_BIN_PATH: /mount/testdata1/
-      XUANTIE_TAR_NAME: 'Xuantie-900-gcc-linux-5.15.0-glibc-x86_64-V2.8.1'
     if: "!needs.smart_ci.outputs.skip_workflow"
 
     steps:
@@ -222,6 +201,42 @@ jobs:
       - name: Clean ccache
         run: ccache --cleanup
 
+  # Build_2:
+  #   needs: [Docker, Smart_CI]
+  #   uses: ./.github/workflows/job_build_linux.yml
+  #   with:
+  #     runner: 'aks-linux-16-cores-32gb'
+  #     container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_build.ubuntu_22_04_riscv }}", "volumes": ["/mount:/mount"], "options": "-e SCCACHE_AZURE_BLOB_CONTAINER -e SCCACHE_AZURE_CONNECTION_STRING"}'
+  #     affected-components: ${{ needs.smart_ci.outputs.affected_components }}
+  #     event-name: ${{ github.event_name }}
+  #     os: 'ubuntu_22_04'
+  #     build-js: false
+  #     build-contrib: false
+  #     build-debian-packages: true
+  #     build-rpm-packages: false
+  #     cmake-options: |-
+  #       -G "${{ env.CMAKE_GENERATOR }}" \
+  #       -DENABLE_CPPLINT=OFF \
+  #       -DENABLE_NCC_STYLE=OFF \
+  #       -DENABLE_TESTS=ON \
+  #       -DENABLE_INTEL_CPU=ON \
+  #       -DENABLE_INTEL_GPU=OFF \
+  #       -DENABLE_INTEL_NPU=OFF \
+  #       -DENABLE_SAMPLES=ON \
+  #       -DCMAKE_TOOLCHAIN_FILE=${OPENVINO_REPO}/cmake/toolchains/riscv64-071-xuantie-gnu.toolchain.cmake \
+  #       -DRISCV_TOOLCHAIN_ROOT=${XUANTIE_DIR}/${XUANTIE_TAR_NAME} \
+  #       -DENABLE_PYTHON=ON \
+  #       -DENABLE_PYTHON_PACKAGING=ON \
+  #       -DENABLE_WHEEL=ON \
+  #       -DENABLE_STRICT_DEPENDENCIES=OFF \
+  #       -DCMAKE_VERBOSE_MAKEFILE=ON \
+  #       -DCPACK_GENERATOR=TGZ \
+  #       -DCMAKE_COMPILE_WARNING_AS_ERROR=OFF \
+  #       -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CMAKE_CXX_COMPILER_LAUNCHER }} \
+  #       -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CMAKE_C_COMPILER_LAUNCHER }} \
+  #       -S ${OPENVINO_REPO} \
+  #       -B ${BUILD_DIR}
+
   CPU_Functional_Tests:
     name: CPU functional tests
     needs: [ Docker, Build, Smart_CI ]