From 2e2912930ca4cda197f01bec1d28cc83c2ea1a4d Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Tue, 28 May 2024 16:58:47 -0700 Subject: [PATCH 1/7] remove useless param --- .../templates/stages/partner-release.yml | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 eng/pipelines/templates/stages/partner-release.yml diff --git a/eng/pipelines/templates/stages/partner-release.yml b/eng/pipelines/templates/stages/partner-release.yml new file mode 100644 index 000000000000..662bef1b4523 --- /dev/null +++ b/eng/pipelines/templates/stages/partner-release.yml @@ -0,0 +1,65 @@ +trigger: none +pr: none + +parameters: + +- name: BlobPath + displayName: 'Container relative blob path' + type: string + default: '/java/' + +extends: + template: /eng/pipelines/templates/stages/1es-redirect.yml + parameters: + stages: + - stage: + displayName: 'Partner Release' + variables: + - name: Artifacts + value: $(Pipeline.Workspace)/artifacts + + jobs: + - job: + displayName: 'Download and publish artifacts' + pool: + name: $(WINDOWSPOOL) + image: $(WINDOWSVMIMAGE) + os: windows + + steps: + - task: AzurePowerShell@5 + displayName: 'Copy from azuresdkpartnerdrops' + condition: and(succeeded(), ne(variables['SkipCopyFromPartnerDrops'], 'true')) + inputs: + azureSubscription: 'azuresdkpartnerdrops - Storage Partner Drops' + ScriptType: 'InlineScript' + azurePowerShellVersion: LatestVersion + pwsh: true + Inline: | + azcopy copy 'https://azuresdkpartnerdrops.blob.core.windows.net/drops/${{ parameters.BlobPath }}/*' '$(Artifacts)' --recursive=true + echo "Copied files:" + dir '$(Artifacts)' -r | % { $_.FullName } + env: + AZCOPY_AUTO_LOGIN_TYPE: 'PSCRED' + + - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml + parameters: + ArtifactName: 'partner-artifacts' + ArtifactPath: $(Artifacts) + + - task: EsrpRelease@7 + displayName: 'Publish via ESRP' + inputs: + ConnectedServiceName: 'Azure SDK Engineering System' + ClientId: '5f81938c-2544-4f1f-9251-dd9de5b8a81b' + KeyVaultName: 'AzureSDKEngKeyVault' + AuthCertName: 'azure-sdk-esrp-release-auth-certificate' + SignCertName: 'azure-sdk-esrp-release-sign-certificate' + Intent: 'PackageDistribution' + ContentType: 'PyPI' + FolderLocation: $(Artifacts) + Owners: $(Build.RequestedForEmail) + Approvers: $(Build.RequestedForEmail) + ServiceEndpointUrl: 'https://api.esrp.microsoft.com' + MainPublisher: 'ESRPRELPACMANTEST' + DomainTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47' \ No newline at end of file From 01a1e7924d4e57ad5f9d65a39ee4f3561d7477b0 Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Tue, 28 May 2024 17:31:38 -0700 Subject: [PATCH 2/7] update default value for param --- eng/pipelines/templates/stages/partner-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/stages/partner-release.yml b/eng/pipelines/templates/stages/partner-release.yml index 662bef1b4523..14a2ad87c2ce 100644 --- a/eng/pipelines/templates/stages/partner-release.yml +++ b/eng/pipelines/templates/stages/partner-release.yml @@ -6,7 +6,7 @@ parameters: - name: BlobPath displayName: 'Container relative blob path' type: string - default: '/java/' + default: '/python/' extends: template: /eng/pipelines/templates/stages/1es-redirect.yml @@ -44,7 +44,7 @@ extends: - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml parameters: - ArtifactName: 'partner-artifacts' + ArtifactName: 'artifacts-for-release' ArtifactPath: $(Artifacts) - task: EsrpRelease@7 From 781bfdc62dd843aec1ea2bf6cb2609b6e4161a1e Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Tue, 28 May 2024 17:34:44 -0700 Subject: [PATCH 3/7] disable the 1es artifacts side of the job until we can make this thing work at all_ --- eng/pipelines/templates/stages/partner-release.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/templates/stages/partner-release.yml b/eng/pipelines/templates/stages/partner-release.yml index 14a2ad87c2ce..95502e3b947d 100644 --- a/eng/pipelines/templates/stages/partner-release.yml +++ b/eng/pipelines/templates/stages/partner-release.yml @@ -8,9 +8,9 @@ parameters: type: string default: '/python/' -extends: - template: /eng/pipelines/templates/stages/1es-redirect.yml - parameters: +# extends: +# template: /eng/pipelines/templates/stages/1es-redirect.yml +# parameters: stages: - stage: displayName: 'Partner Release' @@ -42,10 +42,10 @@ extends: env: AZCOPY_AUTO_LOGIN_TYPE: 'PSCRED' - - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml - parameters: - ArtifactName: 'artifacts-for-release' - ArtifactPath: $(Artifacts) + # - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml + # parameters: + # ArtifactName: 'artifacts-for-release' + # ArtifactPath: $(Artifacts) - task: EsrpRelease@7 displayName: 'Publish via ESRP' From b4067471e966bea3d544527f71966b64038b1725 Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Tue, 28 May 2024 17:36:06 -0700 Subject: [PATCH 4/7] can't find a block mapping? --- .../templates/stages/partner-release.yml | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/pipelines/templates/stages/partner-release.yml b/eng/pipelines/templates/stages/partner-release.yml index 95502e3b947d..a6174bdd5c27 100644 --- a/eng/pipelines/templates/stages/partner-release.yml +++ b/eng/pipelines/templates/stages/partner-release.yml @@ -11,43 +11,43 @@ parameters: # extends: # template: /eng/pipelines/templates/stages/1es-redirect.yml # parameters: - stages: - - stage: - displayName: 'Partner Release' - variables: - - name: Artifacts - value: $(Pipeline.Workspace)/artifacts +stages: + - stage: + displayName: 'Partner Release' + variables: + - name: Artifacts + value: $(Pipeline.Workspace)/artifacts - jobs: - - job: - displayName: 'Download and publish artifacts' - pool: - name: $(WINDOWSPOOL) - image: $(WINDOWSVMIMAGE) - os: windows + jobs: + - job: + displayName: 'Download and publish artifacts' + pool: + name: $(WINDOWSPOOL) + image: $(WINDOWSVMIMAGE) + os: windows - steps: - - task: AzurePowerShell@5 - displayName: 'Copy from azuresdkpartnerdrops' - condition: and(succeeded(), ne(variables['SkipCopyFromPartnerDrops'], 'true')) - inputs: - azureSubscription: 'azuresdkpartnerdrops - Storage Partner Drops' - ScriptType: 'InlineScript' - azurePowerShellVersion: LatestVersion - pwsh: true - Inline: | - azcopy copy 'https://azuresdkpartnerdrops.blob.core.windows.net/drops/${{ parameters.BlobPath }}/*' '$(Artifacts)' --recursive=true - echo "Copied files:" - dir '$(Artifacts)' -r | % { $_.FullName } - env: - AZCOPY_AUTO_LOGIN_TYPE: 'PSCRED' + steps: + - task: AzurePowerShell@5 + displayName: 'Copy from azuresdkpartnerdrops' + condition: and(succeeded(), ne(variables['SkipCopyFromPartnerDrops'], 'true')) + inputs: + azureSubscription: 'azuresdkpartnerdrops - Storage Partner Drops' + ScriptType: 'InlineScript' + azurePowerShellVersion: LatestVersion + pwsh: true + Inline: | + azcopy copy 'https://azuresdkpartnerdrops.blob.core.windows.net/drops/${{ parameters.BlobPath }}/*' '$(Artifacts)' --recursive=true + echo "Copied files:" + dir '$(Artifacts)' -r | % { $_.FullName } + env: + AZCOPY_AUTO_LOGIN_TYPE: 'PSCRED' - # - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml - # parameters: - # ArtifactName: 'artifacts-for-release' - # ArtifactPath: $(Artifacts) + # - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml + # parameters: + # ArtifactName: 'artifacts-for-release' + # ArtifactPath: $(Artifacts) - - task: EsrpRelease@7 + - task: EsrpRelease@7 displayName: 'Publish via ESRP' inputs: ConnectedServiceName: 'Azure SDK Engineering System' From 1c068b01b928b7212f64c23a8ed03ce67b540194 Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Tue, 28 May 2024 17:36:38 -0700 Subject: [PATCH 5/7] align the yaml --- .../templates/stages/partner-release.yml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/pipelines/templates/stages/partner-release.yml b/eng/pipelines/templates/stages/partner-release.yml index a6174bdd5c27..8558eb007548 100644 --- a/eng/pipelines/templates/stages/partner-release.yml +++ b/eng/pipelines/templates/stages/partner-release.yml @@ -48,18 +48,18 @@ stages: # ArtifactPath: $(Artifacts) - task: EsrpRelease@7 - displayName: 'Publish via ESRP' - inputs: - ConnectedServiceName: 'Azure SDK Engineering System' - ClientId: '5f81938c-2544-4f1f-9251-dd9de5b8a81b' - KeyVaultName: 'AzureSDKEngKeyVault' - AuthCertName: 'azure-sdk-esrp-release-auth-certificate' - SignCertName: 'azure-sdk-esrp-release-sign-certificate' - Intent: 'PackageDistribution' - ContentType: 'PyPI' - FolderLocation: $(Artifacts) - Owners: $(Build.RequestedForEmail) - Approvers: $(Build.RequestedForEmail) - ServiceEndpointUrl: 'https://api.esrp.microsoft.com' - MainPublisher: 'ESRPRELPACMANTEST' - DomainTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47' \ No newline at end of file + displayName: 'Publish via ESRP' + inputs: + ConnectedServiceName: 'Azure SDK Engineering System' + ClientId: '5f81938c-2544-4f1f-9251-dd9de5b8a81b' + KeyVaultName: 'AzureSDKEngKeyVault' + AuthCertName: 'azure-sdk-esrp-release-auth-certificate' + SignCertName: 'azure-sdk-esrp-release-sign-certificate' + Intent: 'PackageDistribution' + ContentType: 'PyPI' + FolderLocation: $(Artifacts) + Owners: $(Build.RequestedForEmail) + Approvers: $(Build.RequestedForEmail) + ServiceEndpointUrl: 'https://api.esrp.microsoft.com' + MainPublisher: 'ESRPRELPACMANTEST' + DomainTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47' \ No newline at end of file From f080bc84c9ed17c5b1a2106dd548d163cd2cab80 Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Tue, 28 May 2024 17:38:41 -0700 Subject: [PATCH 6/7] include image.yml so that we refer to an actual pool --- eng/pipelines/templates/stages/partner-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/templates/stages/partner-release.yml b/eng/pipelines/templates/stages/partner-release.yml index 8558eb007548..24b06f05b943 100644 --- a/eng/pipelines/templates/stages/partner-release.yml +++ b/eng/pipelines/templates/stages/partner-release.yml @@ -17,6 +17,7 @@ stages: variables: - name: Artifacts value: $(Pipeline.Workspace)/artifacts + - template: /eng/pipelines/templates/variables/image.yml jobs: - job: From 5954506601943a91de540626e3201a2c12d612c9 Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Wed, 29 May 2024 13:38:23 -0700 Subject: [PATCH 7/7] re-enable the 1es templates. time to test another release as well --- .../templates/stages/partner-release.yml | 104 +++++++++--------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/eng/pipelines/templates/stages/partner-release.yml b/eng/pipelines/templates/stages/partner-release.yml index 24b06f05b943..fa3994003a9c 100644 --- a/eng/pipelines/templates/stages/partner-release.yml +++ b/eng/pipelines/templates/stages/partner-release.yml @@ -8,59 +8,59 @@ parameters: type: string default: '/python/' -# extends: -# template: /eng/pipelines/templates/stages/1es-redirect.yml -# parameters: -stages: - - stage: - displayName: 'Partner Release' - variables: - - name: Artifacts - value: $(Pipeline.Workspace)/artifacts - - template: /eng/pipelines/templates/variables/image.yml +extends: + template: /eng/pipelines/templates/stages/1es-redirect.yml + parameters: + stages: + - stage: + displayName: 'Partner Release' + variables: + - name: Artifacts + value: $(Pipeline.Workspace)/artifacts + - template: /eng/pipelines/templates/variables/image.yml - jobs: - - job: - displayName: 'Download and publish artifacts' - pool: - name: $(WINDOWSPOOL) - image: $(WINDOWSVMIMAGE) - os: windows + jobs: + - job: + displayName: 'Download and publish artifacts' + pool: + name: $(WINDOWSPOOL) + image: $(WINDOWSVMIMAGE) + os: windows - steps: - - task: AzurePowerShell@5 - displayName: 'Copy from azuresdkpartnerdrops' - condition: and(succeeded(), ne(variables['SkipCopyFromPartnerDrops'], 'true')) - inputs: - azureSubscription: 'azuresdkpartnerdrops - Storage Partner Drops' - ScriptType: 'InlineScript' - azurePowerShellVersion: LatestVersion - pwsh: true - Inline: | - azcopy copy 'https://azuresdkpartnerdrops.blob.core.windows.net/drops/${{ parameters.BlobPath }}/*' '$(Artifacts)' --recursive=true - echo "Copied files:" - dir '$(Artifacts)' -r | % { $_.FullName } - env: - AZCOPY_AUTO_LOGIN_TYPE: 'PSCRED' + steps: + - task: AzurePowerShell@5 + displayName: 'Copy from azuresdkpartnerdrops' + condition: and(succeeded(), ne(variables['SkipCopyFromPartnerDrops'], 'true')) + inputs: + azureSubscription: 'azuresdkpartnerdrops - Storage Partner Drops' + ScriptType: 'InlineScript' + azurePowerShellVersion: LatestVersion + pwsh: true + Inline: | + azcopy copy 'https://azuresdkpartnerdrops.blob.core.windows.net/drops/${{ parameters.BlobPath }}/*' '$(Artifacts)' --recursive=true + echo "Copied files:" + dir '$(Artifacts)' -r | % { $_.FullName } + env: + AZCOPY_AUTO_LOGIN_TYPE: 'PSCRED' - # - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml - # parameters: - # ArtifactName: 'artifacts-for-release' - # ArtifactPath: $(Artifacts) + - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml + parameters: + ArtifactName: 'artifacts-for-release' + ArtifactPath: $(Artifacts) - - task: EsrpRelease@7 - displayName: 'Publish via ESRP' - inputs: - ConnectedServiceName: 'Azure SDK Engineering System' - ClientId: '5f81938c-2544-4f1f-9251-dd9de5b8a81b' - KeyVaultName: 'AzureSDKEngKeyVault' - AuthCertName: 'azure-sdk-esrp-release-auth-certificate' - SignCertName: 'azure-sdk-esrp-release-sign-certificate' - Intent: 'PackageDistribution' - ContentType: 'PyPI' - FolderLocation: $(Artifacts) - Owners: $(Build.RequestedForEmail) - Approvers: $(Build.RequestedForEmail) - ServiceEndpointUrl: 'https://api.esrp.microsoft.com' - MainPublisher: 'ESRPRELPACMANTEST' - DomainTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47' \ No newline at end of file + - task: EsrpRelease@7 + displayName: 'Publish via ESRP' + inputs: + ConnectedServiceName: 'Azure SDK Engineering System' + ClientId: '5f81938c-2544-4f1f-9251-dd9de5b8a81b' + KeyVaultName: 'AzureSDKEngKeyVault' + AuthCertName: 'azure-sdk-esrp-release-auth-certificate' + SignCertName: 'azure-sdk-esrp-release-sign-certificate' + Intent: 'PackageDistribution' + ContentType: 'PyPI' + FolderLocation: $(Artifacts) + Owners: $(Build.RequestedForEmail) + Approvers: $(Build.RequestedForEmail) + ServiceEndpointUrl: 'https://api.esrp.microsoft.com' + MainPublisher: 'ESRPRELPACMANTEST' + DomainTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47' \ No newline at end of file