From 523b653eb45c17395b76e00e1970332799fbe450 Mon Sep 17 00:00:00 2001
From: Andrei Kashchikhin <andrey.kashchikhin@intel.com>
Date: Fri, 30 Jun 2023 16:16:51 +0100
Subject: [PATCH] execute samples tests in the build stage

---
 .github/workflows/test_linux.yml   | 32 +++++++++++++++---------------
 .github/workflows/test_windows.yml | 26 ++++++++++++------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml
index 829bb8ea1..1c276407d 100644
--- a/.github/workflows/test_linux.yml
+++ b/.github/workflows/test_linux.yml
@@ -222,6 +222,22 @@ jobs:
       # Tests
       #
 
+      - name: Samples tests
+        run: |
+          python3 -m pip install --ignore-installed PyYAML -r ${{ env.INSTALL_TEST_DIR }}/smoke_tests/requirements.txt
+          export LD_LIBRARY_PATH=${{ env.IE_APP_PATH }}:$LD_LIBRARY_PATH
+
+          source ${{ env.INSTALL_DIR }}/setupvars.sh
+
+          python3 -m pytest -sv ${{ env.INSTALL_TEST_DIR }}/smoke_tests \
+            --env_conf ${{ env.INSTALL_TEST_DIR }}/smoke_tests/env_config.yml \
+            --junitxml=${{ env.INSTALL_TEST_DIR }}/TEST-SamplesSmokeTests.xml
+        env:
+          IE_APP_PATH: ${{ env.INSTALL_DIR }}/samples_bin
+          IE_APP_PYTHON_PATH: ${{ env.INSTALL_DIR }}/samples/python
+          SHARE: ${{ env.INSTALL_TEST_DIR }}/smoke_tests/samples_smoke_tests_data
+          WORKSPACE: ${{ env.INSTALL_DIR }}
+
       # Present in the "Build" job due to the fact that these tests require build directory
       - name: ONNX frontend tests
         if: ${{ always() }}
@@ -550,22 +566,6 @@ jobs:
         run: |
           python3 -m pip install openvino-dev --find-links=${{ env.INSTALL_DIR }}/tools
 
-      - name: Samples tests
-        run: |
-          python3 -m pip install --ignore-installed PyYAML -r ${{ env.INSTALL_TEST_DIR }}/smoke_tests/requirements.txt
-          export LD_LIBRARY_PATH=${{ env.IE_APP_PATH }}:$LD_LIBRARY_PATH
-
-          source ${{ env.INSTALL_DIR }}/setupvars.sh
-          
-          python3 -m pytest -sv ${{ env.INSTALL_TEST_DIR }}/smoke_tests \
-            --env_conf ${{ env.INSTALL_TEST_DIR }}/smoke_tests/env_config.yml \
-            --junitxml=${{ env.INSTALL_TEST_DIR }}/TEST-SamplesSmokeTests.xml
-        env:
-          IE_APP_PATH: ${{ env.INSTALL_DIR }}/samples_bin
-          IE_APP_PYTHON_PATH: ${{ env.INSTALL_DIR }}/samples/python
-          SHARE: ${{ env.INSTALL_TEST_DIR }}/smoke_tests/samples_smoke_tests_data
-          WORKSPACE: ${{ env.INSTALL_DIR }}
-
       - name: nGraph and IE Python Bindings Tests
         run: |
           source ${{ env.INSTALL_DIR }}/setupvars.sh
diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml
index a729bf5f9..e4f5b3366 100644
--- a/.github/workflows/test_windows.yml
+++ b/.github/workflows/test_windows.yml
@@ -117,7 +117,7 @@ jobs:
 
       - uses: ilammy/msvc-dev-cmd@v1
 
-      - name: ccache
+      - name: Setup sccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
           variant: sccache
@@ -208,6 +208,18 @@ jobs:
           & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat" x64
           & ${{ env.SAMPLES_INSTALL_DIR }}/c/build_samples_msvc.bat -i ${{ env.INSTALL_DIR }}
 
+      - name: Samples tests
+        if: ${{ always() }}
+        shell: cmd
+        run: |
+          python3 -m pip install --ignore-installed PyYAML -r ${{ env.INSTALL_TEST_DIR }}/smoke_tests/requirements.txt
+          call "${{ env.INSTALL_DIR }}\\setupvars.bat" && python3 -m pytest -sv ${{ env.INSTALL_TEST_DIR }}/smoke_tests --env_conf ${{ env.INSTALL_TEST_DIR }}/smoke_tests/env_config.yml --junitxml=${{ env.INSTALL_TEST_DIR }}/TEST-SamplesSmokeTests.xml
+        env:
+          IE_APP_PATH: ${{ env.INSTALL_DIR }}/samples_bin
+          IE_APP_PYTHON_PATH: ${{ env.INSTALL_DIR }}/samples/python
+          SHARE: ${{ env.INSTALL_TEST_DIR }}/smoke_tests/samples_smoke_tests_data
+          WORKSPACE: ${{ env.INSTALL_DIR }}
+
       # Present in the "Build" job due to the fact that these tests require build directory
       - name: ONNX frontend tests
         shell: cmd
@@ -473,18 +485,6 @@ jobs:
         run: |
           python3 -m pip install openvino-dev --force-reinstall --find-links=${{ env.INSTALL_DIR }}\tools
 
-      - name: Samples tests
-        if: ${{ always() }}
-        shell: cmd
-        run: |
-          python3 -m pip install --ignore-installed PyYAML -r ${{ env.INSTALL_TEST_DIR }}/smoke_tests/requirements.txt
-          call "${{ env.INSTALL_DIR }}\\setupvars.bat" && python3 -m pytest -sv ${{ env.INSTALL_TEST_DIR }}/smoke_tests --env_conf ${{ env.INSTALL_TEST_DIR }}/smoke_tests/env_config.yml --junitxml=${{ env.INSTALL_TEST_DIR }}/TEST-SamplesSmokeTests.xml
-        env:
-          IE_APP_PATH: ${{ env.INSTALL_DIR }}/samples_bin
-          IE_APP_PYTHON_PATH: ${{ env.INSTALL_DIR }}/samples/python
-          SHARE: ${{ env.INSTALL_TEST_DIR }}/smoke_tests/samples_smoke_tests_data
-          WORKSPACE: ${{ env.INSTALL_DIR }}
-
       - name: nGraph and IE Python Bindings Tests
         if: ${{ always() }}
         shell: cmd