Bring back the gcovr

microsoft · Jul 22, 2024 · 0312793 · 0312793
1 parent 78ee913
commit 0312793
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml
@@ -108,8 +108,7 @@ stages:
 
 - stage: BUILD_AND_TEST_NNAPI_EP
   dependsOn: []
-#  condition: notIn(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')
-  condition: not(always())
+  condition: notIn(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')
   variables:
     Codeql.ProjectConfigPath: .github/workflows
     Codeql.Enabled: true
@@ -180,14 +179,14 @@ stages:
   # because coverage report is hard to support in cross machines.
   displayName: NNAPI MASTER BUILD&TEST
   dependsOn: []
-#  condition: in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')
+  condition: in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')
   jobs:
   - job: NNAPI_EP_MASTER
     pool: onnxruntime-Ubuntu2204-AMD-CPU
     timeoutInMinutes: 180
     workspace:
       clean: all
-    condition: always()
+    condition: in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')
     steps:
       - task: UsePythonVersion@0
         displayName: Use Python $(pythonVersion)
@@ -227,6 +226,7 @@ stages:
         displayName: NNAPI EP, Build, Test, CodeCoverage on Android Emulator
 
       - script: |
+          python3 -m pip install gcovr && \
           python3 tools/ci_build/coverage.py \
             --build_dir build_nnapi \
             --android_sdk_path $ANDROID_HOME
@@ -235,6 +235,10 @@ stages:
       - script: cat '$(Build.SourcesDirectory)/build_nnapi/Debug/coverage_rpt.txt'
         displayName: Print coverage report
 
+      - script: /bin/bash tools/ci_build/github/linux/ort_minimal/nnapi_minimal_build_minimal_ort_and_run_tests.sh $(pwd)
+        # Build Minimal ORT with NNAPI and reduced Ops, run unit tests on Android Emulator
+        displayName: Build Minimal ORT with NNAPI and run tests
+
       - task: AzureCLI@2
         displayName: 'Post Android Code Coverage To DashBoard'
         inputs:
@@ -244,10 +248,6 @@ stages:
           arguments: '"$(Build.SourcesDirectory)/build_nnapi/Debug/coverage_rpt.txt" "https://dev.azure.com/onnxruntime/onnxruntime/_build/results?buildId=$(Build.BuildId)" arm android nnapi'
           workingDirectory: '$(Build.BinariesDirectory)'
 
-      - script: /bin/bash tools/ci_build/github/linux/ort_minimal/nnapi_minimal_build_minimal_ort_and_run_tests.sh $(pwd)
-        # Build Minimal ORT with NNAPI and reduced Ops, run unit tests on Android Emulator
-        displayName: Build Minimal ORT with NNAPI and run tests
-
       - template: templates/use-android-emulator.yml
         parameters:
           stop: true