From 09e605dcd1dc1e74538d59a951a866a0641ea97d Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Mon, 28 Sep 2020 09:06:16 -0700 Subject: [PATCH 1/3] Use new release script for Linux packages --- .../templates/release-PublishPackageMsftCom.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml b/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml index 27d76a11fed..c03da49814a 100644 --- a/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml +++ b/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml @@ -17,6 +17,13 @@ steps: - pwsh: | $metadata = Get-Content -Path "$ENV:PIPELINE_WORKSPACE/releasePipeline/metadata/release.json" -Raw | ConvertFrom-Json - Write-Verbose -Verbose "$(releaseTag) $(PackagesRepoPassword) $(AzureVersion) $($metadata.LTSRelease)" - & '$(Pipeline.Workspace)/tools/packages.microsoft.com/upload.ps1' -ReleaseTag "$(releaseTag)" -Secret "$(PackagesRepoPassword)" -BlobFolderName "$(AzureVersion)" -LTS:($metadata.LTSRelease) + Write-Verbose -Verbose "$(ReleaseTag) $(RepoClientCLIClientID) $(RepoClientCLISecret) $(AzureVersion) $($metadata.LTSRelease)" + $params = @{ + ReleaseTag = "$(ReleaseTag)" + AadClientId = "$(RepoClientCLIClientID)" + AadClientSecret = "$(RepoClientCLISecret)" + BlobFolderName = "$(AzureVersion)" + LTS = ($metadata.LTSRelease) + } + & '$(Pipeline.Workspace)/tools/packages.microsoft.com/releaseLinuxPackages.ps1' @params displayName: Run release script From 66dd0992238a9da3467551f7fea1fc9135d72332 Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Mon, 28 Sep 2020 09:12:16 -0700 Subject: [PATCH 2/3] Fix casing of CLI --- .../azureDevOps/templates/release-PublishPackageMsftCom.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml b/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml index c03da49814a..8bf4eb9cdf3 100644 --- a/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml +++ b/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml @@ -17,11 +17,11 @@ steps: - pwsh: | $metadata = Get-Content -Path "$ENV:PIPELINE_WORKSPACE/releasePipeline/metadata/release.json" -Raw | ConvertFrom-Json - Write-Verbose -Verbose "$(ReleaseTag) $(RepoClientCLIClientID) $(RepoClientCLISecret) $(AzureVersion) $($metadata.LTSRelease)" + Write-Verbose -Verbose "$(ReleaseTag) $(RepoClientCliClientID) $(RepoClientCliSecret) $(AzureVersion) $($metadata.LTSRelease)" $params = @{ ReleaseTag = "$(ReleaseTag)" - AadClientId = "$(RepoClientCLIClientID)" - AadClientSecret = "$(RepoClientCLISecret)" + AadClientId = "$(RepoClientCliClientID)" + AadClientSecret = "$(RepoClientCliSecret)" BlobFolderName = "$(AzureVersion)" LTS = ($metadata.LTSRelease) } From 17662ce0fdc076c3789f4bd142677c8bf6eb4ec3 Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Mon, 28 Sep 2020 22:43:15 -0600 Subject: [PATCH 3/3] Update tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml --- .../azureDevOps/templates/release-PublishPackageMsftCom.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml b/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml index 8bf4eb9cdf3..42507b2d7b0 100644 --- a/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml +++ b/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml @@ -23,7 +23,7 @@ steps: AadClientId = "$(RepoClientCliClientID)" AadClientSecret = "$(RepoClientCliSecret)" BlobFolderName = "$(AzureVersion)" - LTS = ($metadata.LTSRelease) + LTS = $metadata.LTSRelease } & '$(Pipeline.Workspace)/tools/packages.microsoft.com/releaseLinuxPackages.ps1' @params displayName: Run release script