vars moved to docker

openvinotoolkit · Dec 18, 2024 · de2609b · de2609b
1 parent 865d0cf
commit de2609b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 25 deletions.
diff --git a/.github/dockerfiles/ov_build/ubuntu_22_04_riscv/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_22_04_riscv/Dockerfile
@@ -13,11 +13,12 @@ ENV DEBIAN_FRONTEND="noninteractive" \
     TZ="Europe/London" \
     CCACHE_MAXSIZE=2G \
     CMAKE_GENERATOR='Ninja Multi-Config' \
-    XUANTIE_DIR=/__w/openvino/xuantie \
-    XUANTIE_BIN_PATH=/mount/testdata1/ \
-    XUANTIE_TAR_NAME='Xuantie-900-gcc-linux-5.15.0-glibc-x86_64-V2.8.1' \
     OPENVINO_REPO=/__w/openvino/openvino/openvino \
     BUILD_DIR=/__w/openvino/openvino/openvino_build \
+    # XUANTIE VARS
+    XUANTIE_BIN_PATH=/mount/testdata1/ \
+    XUANTIE_DIR=/__w/openvino/xuantie \
+    XUANTIE_TAR_NAME='Xuantie-900-gcc-linux-5.15.0-glibc-x86_64-V2.8.1' \
     RISCV_TOOLCHAIN_ROOT=/__w/openvino/xuantie/Xuantie-900-gcc-linux-5.15.0-glibc-x86_64-V2.8.1/
 
 RUN apt-get update && \

diff --git a/.github/workflows/dev_cpu_linux_riscv.yml b/.github/workflows/dev_cpu_linux_riscv.yml
@@ -79,7 +79,6 @@ jobs:
         - /mount:/mount
     env:
       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
@@ -92,12 +91,9 @@ jobs:
       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
-      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:
@@ -139,10 +135,10 @@ jobs:
             ln -s /usr/include/riscv64-linux-gnu/ /usr/include/python3.10/
           popd
 
-      - name: CMake configure - OpenVINO - 2
+      - name: CMake configure - OpenVINO
         run: |
           cmake \
-            -G "${{ env.CMAKE_GENERATOR }}" \
+            -G "${CMAKE_GENERATOR}" \
             -DENABLE_CPPLINT=OFF \
             -DENABLE_NCC_STYLE=OFF \
             -DENABLE_TESTS=ON \
@@ -182,8 +178,6 @@ jobs:
 
           pushd ${INSTALL_TEST_DIR}
             tar -czvf ${BUILD_DIR}/openvino_tests.tar.gz *
-            echo RISCV_TOOLCHAIN_ROOT
-            echo ${RISCV_TOOLCHAIN_ROOT}
           popd
 
       # #
@@ -194,7 +188,7 @@ jobs:
         if: always()
         with:
           name: xuantie
-          path: ${{ env.XUANTIE_DIR }}
+          path: ${{ vars.XUANTIE_DIR }}
           if-no-files-found: 'ignore'
 
       - name: Upload build logs
@@ -224,16 +218,6 @@ jobs:
       - name: Clean ccache
         run: ccache --cleanup
 
-  # Resolve_Gtest_Filter:
-  #   runs-on: ubuntu-latest
-  #   outputs:
-  #     gtest_filter: ${{ steps.step1.outputs.key }}
-  #   steps:
-  #     - id: step1
-  #       run: echo "gtest_filter=hello" >> "$GITHUB_OUTPUT"
-  #     - id: step2
-  #       run: echo "gtest_filter=world" >> "$GITHUB_OUTPUT"
-
   CPU_Functional_Tests:
     name: CPU functional tests
     needs: [ Docker, Build, Smart_CI ]
@@ -250,16 +234,14 @@ jobs:
       DEBIAN_FRONTEND: noninteractive # to prevent apt-get from waiting user input
       INSTALL_DIR: ${{ github.workspace }}/install
       INSTALL_TEST_DIR: ${{ github.workspace }}/install/tests
-      XUANTIE_TAR_NAME: 'Xuantie-900-gcc-linux-5.15.0-glibc-x86_64-V2.8.1'
-      XUANTIE_DIR: /__w/openvino/xuantie
       GTEST_FILTER: '*smoke_AdaPoolAvg4DLayoutTest*'
 
     steps:
       - name: Download OpenVINO package
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: xuantie
-          path: ${{ env.XUANTIE_DIR }}
+          path: ${{ vars.XUANTIE_DIR }}
 
       - name: Download OpenVINO package
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8