From 4dcbd85ef7bdf126ef307d2cc65a9ff2e189f163 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Mon, 22 Aug 2022 23:08:26 +0400 Subject: [PATCH] Azure: Try to take into account result of previous step as well (#12695) * Fix openvino_contrib version * [linux_arm64] Fix openvino contrib version * [linux_debian] Fix openvino contrib version * Azure: Try to take into account result of previous step as well * Removed excess contrib var * Disable CUDA plugin build via cmake flags Co-authored-by: Alina Kladieva --- .ci/azure/linux.yml | 2 +- .ci/azure/linux_conditional_compilation.yml | 1 - .ci/azure/windows.yml | 2 +- .ci/azure/windows_conditional_compilation.yml | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml index bc173f8ea90..404557451ec 100644 --- a/.ci/azure/linux.yml +++ b/.ci/azure/linux.yml @@ -391,7 +391,7 @@ jobs: - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/cpuFuncTests --gtest_filter=*smoke* --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-cpuFuncTests.xml displayName: 'CPU FuncTests' continueOnError: false - condition: eq(variables['CMAKE_BUILD_SHARED_LIBS'], 'OFF') + condition: and(succeeded(), eq(variables['CMAKE_BUILD_SHARED_LIBS'], 'OFF')) - script: | export DATA_PATH=$(MODELS_PATH) diff --git a/.ci/azure/linux_conditional_compilation.yml b/.ci/azure/linux_conditional_compilation.yml index 6c23df40060..b51e71776cf 100644 --- a/.ci/azure/linux_conditional_compilation.yml +++ b/.ci/azure/linux_conditional_compilation.yml @@ -21,7 +21,6 @@ jobs: VSTS_HTTP_TIMEOUT: 200 BUILD_TYPE: Release REPO_DIR: $(Build.Repository.LocalPath) - OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)/../openvino_contrib MODELS_PATH: $(REPO_DIR)/../testdata WORK_DIR: $(Pipeline.Workspace)/_w BUILD_DIR: $(WORK_DIR)/build diff --git a/.ci/azure/windows.yml b/.ci/azure/windows.yml index 2a11b78d052..0bd8b2cd028 100644 --- a/.ci/azure/windows.yml +++ b/.ci/azure/windows.yml @@ -284,7 +284,7 @@ jobs: - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\cpuFuncTests --gtest_filter=*smoke* --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-cpuFuncTests.xml displayName: 'CPU FuncTests' continueOnError: false - condition: eq(variables['CMAKE_BUILD_SHARED_LIBS'], 'OFF') + condition: and(succeeded(), eq(variables['CMAKE_BUILD_SHARED_LIBS'], 'OFF')) - script: | set DATA_PATH=$(MODELS_PATH) diff --git a/.ci/azure/windows_conditional_compilation.yml b/.ci/azure/windows_conditional_compilation.yml index 0cfea7dc529..8c43139f920 100644 --- a/.ci/azure/windows_conditional_compilation.yml +++ b/.ci/azure/windows_conditional_compilation.yml @@ -21,7 +21,6 @@ jobs: VSTS_HTTP_TIMEOUT: 200 BUILD_TYPE: Release REPO_DIR: $(Build.Repository.LocalPath) - OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)\..\openvino_contrib MODELS_PATH: $(REPO_DIR)\..\testdata WORK_DIR: $(Pipeline.Workspace)\_w BUILD_DIR: $(WORK_DIR)\build