From c976cde27530608af8c8fe7f821287e6b5afcddd Mon Sep 17 00:00:00 2001 From: "Shah Asaduzzaman (ASAD)" Date: Wed, 24 Jul 2019 12:34:48 -0700 Subject: [PATCH] Revert "publish nuget package to azure blob (#1309)" This reverts commit 160165016116c2e180399bd03a17d29cb999501f. --- .../azure-pipelines/nuget/templates/cpu.yml | 21 +------------------ .../set-version-number-variables-step.yml | 7 ------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml index db41450b9931b..93c94f35b6786 100644 --- a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml +++ b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml @@ -91,13 +91,7 @@ jobs: cd $cwd - job: NuGet_Packaging - pool: - name: Hosted Windows 2019 with VS2019 - # AzureFileCopy@3 task has some bug that it depends on a particular version of azure power shell, - # which is not available in OnnxRuntime build VMs, but available in the latest hosted agents. - # So, all the copy/publish jobs are being run on hosted agent - # TODO: install the desired azureps on our VMs or use later bugfixed version of AzureFileCopy - demands: azureps + pool: $(AgentPoolWin) dependsOn: - Windows_CI_Dev - Windows_CI_Dev_x86 @@ -156,17 +150,4 @@ jobs: artifactName: 'drop-signed-nuget' targetPath: '$(Build.ArtifactStagingDirectory)' - - template: ../../templates/set-version-number-variables-step.yml - - task: AzureFileCopy@3 - displayName: 'Copy Signed NuGet Package to Blob Store' - condition: ${{ parameters.DoEsrp }} - inputs: - SourcePath: '$(Build.ArtifactStagingDirectory)/Microsoft.ML.OnnxRuntime.$(OnnxRuntimeVersion)-dev-$(OnnxRuntimeGitCommitHashShort).nupkg' - azureSubscription: 'AI Infra Build (00c06639-6ee4-454e-8058-8d8b1703bd87)' - Destination: AzureBlob - storage: ortpackages - ContainerName: ortpackages - - template: test_all_os.yml - - diff --git a/tools/ci_build/github/azure-pipelines/templates/set-version-number-variables-step.yml b/tools/ci_build/github/azure-pipelines/templates/set-version-number-variables-step.yml index dcbdcffb730d8..007d40b7aef0f 100644 --- a/tools/ci_build/github/azure-pipelines/templates/set-version-number-variables-step.yml +++ b/tools/ci_build/github/azure-pipelines/templates/set-version-number-variables-step.yml @@ -12,10 +12,6 @@ steps: FOR /F "tokens=* USEBACKQ" %%F IN (`git rev-parse HEAD`) DO ( @echo ##vso[task.setvariable variable=OnnxRuntimeGitCommitHash;]%%F ) - - FOR /F "tokens=* USEBACKQ" %%F IN (`git rev-parse --short HEAD`) DO ( - @echo ##vso[task.setvariable variable=OnnxRuntimeGitCommitHashShort;]%%F - ) workingDirectory: '$(Build.SourcesDirectory)' condition: eq(variables['Agent.OS'], 'Windows_NT') @@ -30,8 +26,5 @@ steps: _OnnxRuntimeGitCommitHash=$(git rev-parse HEAD) echo "##vso[task.setvariable variable=OnnxRuntimeGitCommitHash;]$_OnnxRuntimeGitCommitHash" - _OnnxRuntimeGitCommitHash=$(git rev-parse --short=8 HEAD) - echo "##vso[task.setvariable variable=OnnxRuntimeGitCommitHashShort;]$_OnnxRuntimeGitCommitHash" - workingDirectory: '$(Build.SourcesDirectory)' condition: not(eq(variables['Agent.OS'], 'Windows_NT')) \ No newline at end of file