diff --git a/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml b/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml index 4ed1b8e3e5..522bbaf52d 100644 --- a/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml @@ -65,6 +65,7 @@ jobs: echo "File not found: ${BINARY_SIZE_DATA_FILE}" exit 1 fi + /usr/bin/python3 -m pip install -r $(Build.SourcesDirectory)/tools/ci_build/github/windows/post_to_dashboard/requirements.txt && \ /usr/bin/python3 $(Build.SourcesDirectory)/tools/ci_build/github/windows/post_binary_sizes_to_dashboard.py \ --commit_hash=$(Build.SourceVersion) \ --size_data_file="${BINARY_SIZE_DATA_FILE}" \ diff --git a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml index 84002ad381..2c42f6b255 100644 --- a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml @@ -857,19 +857,10 @@ jobs: parameters: packageFolder: '$(Build.BinariesDirectory)/nuget-artifact/final-package' - - task: PowerShell@2 - displayName: 'Get Current Date' - inputs: - targetType: 'inline' - script: | - $date = $(Get-Date -Format "yyyy-MM-dd") - Write-Host "##vso[task.setvariable variable=CurrentDate]$date" - - task: CmdLine@2 displayName: 'Post binary sizes to the dashboard database using command line' inputs: script: | - python.exe -m pip install azure-kusto-data[pandas] azure-kusto-ingest[pandas] echo changing directory to artifact download path cd $(Build.BinariesDirectory)/nuget-artifact/final-package echo processing nupkg @@ -888,8 +879,9 @@ jobs: 7z.exe l -slt %%~ni.zip runtimes\osx.10.14-x64\native\libonnxruntime.dylib | findstr /R /C:"^Size = [0-9]*" | for /F "tokens=3" %%a in ('more') do if not "%%a" == "" echo osx,x64,${{ parameters.buildVariant }},%%a >> $(Build.BinariesDirectory)\binary_size_data.txt 7z.exe l -slt %%~ni.zip runtimes\win-x64\native\onnxruntime.dll | findstr /R /C:"^Size = [0-9]*" | for /F "tokens=3" %%a in ('more') do if not "%%a" == "" echo win,x64,${{ parameters.buildVariant }},%%a >> $(Build.BinariesDirectory)\binary_size_data.txt 7z.exe l -slt %%~ni.zip runtimes\win-x86\native\onnxruntime.dll | findstr /R /C:"^Size = [0-9]*" | for /F "tokens=3" %%a in ('more') do if not "%%a" == "" echo win,x86,${{ parameters.buildVariant }},%%a >> $(Build.BinariesDirectory)\binary_size_data.txt - ) - ) + ) + ) + - task: AzureCLI@2 displayName: 'Azure CLI' inputs: @@ -897,6 +889,7 @@ jobs: scriptLocation: inlineScript scriptType: batch inlineScript: | + python.exe -m pip install -r $(Build.SourcesDirectory)\tools\ci_build\github\windows\post_to_dashboard\requirements.txt && ^ python.exe $(Build.SourcesDirectory)\tools\ci_build\github\windows\post_binary_sizes_to_dashboard.py --commit_hash=$(Build.SourceVersion) --size_data_file=binary_size_data.txt --build_project=Lotus --build_id=$(Build.BuildId) workingDirectory: '$(Build.BinariesDirectory)' diff --git a/tools/ci_build/github/linux/upload_code_coverage_data.sh b/tools/ci_build/github/linux/upload_code_coverage_data.sh index 0130c71fbb..2f63e4c2fe 100755 --- a/tools/ci_build/github/linux/upload_code_coverage_data.sh +++ b/tools/ci_build/github/linux/upload_code_coverage_data.sh @@ -1,5 +1,6 @@ #!/bin/bash # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. -set -x +set -x -e +/usr/bin/env python3 -m pip install -r $BUILD_SOURCESDIRECTORY/tools/ci_build/github/windows/post_to_dashboard/requirements.txt $BUILD_SOURCESDIRECTORY/tools/ci_build/github/windows/post_code_coverage_to_dashboard.py --commit_hash=$BUILD_SOURCEVERSION --report_file $1 --report_url $2 --branch $BUILD_SOURCEBRANCHNAME --arch $3 --os $4 --build_config $5 \ No newline at end of file diff --git a/tools/ci_build/github/windows/post_binary_sizes_to_dashboard.py b/tools/ci_build/github/windows/post_binary_sizes_to_dashboard.py index 16cd8294ec..6468366d68 100644 --- a/tools/ci_build/github/windows/post_binary_sizes_to_dashboard.py +++ b/tools/ci_build/github/windows/post_binary_sizes_to_dashboard.py @@ -9,10 +9,12 @@ import os import datetime # ingest from dataframe import pandas -from azure.kusto.data import KustoConnectionStringBuilder +from azure.kusto.data import ( + DataFormat, + KustoConnectionStringBuilder, +) from azure.kusto.ingest import ( IngestionProperties, - DataFormat, ReportLevel, QueuedIngestClient, ) diff --git a/tools/ci_build/github/windows/post_code_coverage_to_dashboard.py b/tools/ci_build/github/windows/post_code_coverage_to_dashboard.py index e5cd8a8b28..182c216033 100755 --- a/tools/ci_build/github/windows/post_code_coverage_to_dashboard.py +++ b/tools/ci_build/github/windows/post_code_coverage_to_dashboard.py @@ -14,10 +14,12 @@ import sys import datetime # ingest from dataframe import pandas -from azure.kusto.data import KustoConnectionStringBuilder +from azure.kusto.data import ( + DataFormat, + KustoConnectionStringBuilder, +) from azure.kusto.ingest import ( IngestionProperties, - DataFormat, ReportLevel, QueuedIngestClient, ) @@ -25,7 +27,7 @@ from azure.kusto.ingest import ( def parse_arguments(): parser = argparse.ArgumentParser( - description="ONNXRuntime test coverge report uploader for dashboard") + description="ONNXRuntime test coverage report uploader for dashboard") parser.add_argument("--report_url", type=str, help="URL to the LLVM json report") parser.add_argument( "--report_file", type=str, help="Path to the local JSON/TXT report", required=True) diff --git a/tools/ci_build/github/windows/post_to_dashboard/requirements.txt b/tools/ci_build/github/windows/post_to_dashboard/requirements.txt new file mode 100644 index 0000000000..b8c00a610b --- /dev/null +++ b/tools/ci_build/github/windows/post_to_dashboard/requirements.txt @@ -0,0 +1,2 @@ +azure-kusto-data[pandas]==3.0.1 +azure-kusto-ingest[pandas]==3.0.1