Skip to content

Commit 295c3ba

Browse files
authored
Use publish-artifact template and unique artifact names for gpg artifacts (Azure#24059)
1 parent de01351 commit 295c3ba

File tree

3 files changed

+25
-19
lines changed

3 files changed

+25
-19
lines changed

eng/pipelines/partner-release.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ steps:
5959
JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java
6060
ShouldPublish: ${{ parameters.ShouldPublish }}
6161
StageOnly: ${{ parameters.StageOnly }}
62-
- publish: $(Artifacts)
63-
artifact: packages-mavencentral
64-
displayName: 'Store gpg signed packages in packages-mavencentral artifact'
62+
- template: /eng/common/pipelines/templates/steps/publish-artifact.yml
63+
parameters:
64+
ArtifactName: packages-mavencentral-$(System.JobAttempt)
65+
ArtifactPath: $(Artifacts)

eng/pipelines/templates/stages/archetype-java-release-pom-only.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,10 @@ stages:
103103
Target: MavenCentral
104104
BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools
105105
JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java
106-
- publish: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
107-
artifact: ${{parameters.ArtifactName}}-mavencentral
108-
displayName: 'Store gpg signed packages in ${{parameters.ArtifactName}}-mavencentral artifact'
106+
- template: /eng/common/pipelines/templates/steps/publish-artifact.yml
107+
parameters:
108+
ArtifactName: ${{parameters.ArtifactName}}-${{artifact.name}}-mavencentral-$(System.JobAttempt)
109+
ArtifactPath: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
109110
# After publishing to Maven, publish to the azure-sdk-for-java feed. The reason for
110111
# this is that the azure-sdk-for-java feed will have the package available immediately
111112
# whereas Maven can take several hours for the package to become available.
@@ -117,7 +118,8 @@ stages:
117118
RepositoryUrl: https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-java/maven/v1
118119
Target: JavaDevFeed
119120
BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools
120-
JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java
121-
- publish: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
122-
artifact: ${{parameters.ArtifactName}}-javadevfeed
123-
displayName: 'Store gpg signed packages in ${{parameters.ArtifactName}}-javadevfeed artifact'
121+
JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java
122+
- template: /eng/common/pipelines/templates/steps/publish-artifact.yml
123+
parameters:
124+
ArtifactName: ${{parameters.ArtifactName}}-${{artifact.name}}-javadevfeed-$(System.JobAttempt)
125+
ArtifactPath: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed

eng/pipelines/templates/stages/archetype-java-release.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,10 @@ stages:
175175
Target: MavenCentral
176176
BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools
177177
JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java
178-
- publish: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
179-
artifact: ${{parameters.ArtifactName}}-mavencentral
180-
displayName: 'Store gpg signed packages in ${{parameters.ArtifactName}}-mavencentral artifact'
178+
- template: /eng/common/pipelines/templates/steps/publish-artifact.yml
179+
parameters:
180+
ArtifactName: ${{parameters.ArtifactName}}-${{artifact.name}}-mavencentral-$(System.JobAttempt)
181+
ArtifactPath: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
181182
# After publishing to Maven, publish to the azure-sdk-for-java feed. The reason for
182183
# this is that the azure-sdk-for-java feed will have the package available immediately
183184
# whereas Maven can take several hours for the package to become available.
@@ -190,9 +191,10 @@ stages:
190191
Target: JavaDevFeed
191192
BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools
192193
JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java
193-
- publish: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
194-
artifact: ${{parameters.ArtifactName}}-javadevfeed
195-
displayName: 'Store gpg signed packages in ${{parameters.ArtifactName}}-javadevfeed artifact'
194+
- template: /eng/common/pipelines/templates/steps/publish-artifact.yml
195+
parameters:
196+
ArtifactName: ${{parameters.ArtifactName}}-${{artifact.name}}-javadevfeed-$(System.JobAttempt)
197+
ArtifactPath: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
196198

197199
- ${{if ne(artifact.skipPublishDocMs, 'true')}}:
198200
- deployment: PublicDocsMs
@@ -366,6 +368,7 @@ stages:
366368
RepositoryUrl: $(RepositoryUrl)
367369
Target: JavaDevFeed
368370
JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java
369-
- publish: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
370-
artifact: ${{parameters.ArtifactName}}-javadevfeed
371-
displayName: 'Store gpg signed packages in ${{parameters.ArtifactName}}-javadevfeed artifact'
371+
- template: /eng/common/pipelines/templates/steps/publish-artifact.yml
372+
parameters:
373+
ArtifactName: integration-${{parameters.ArtifactName}}-${{artifact.name}}-javadevfeed-$(System.JobAttempt)
374+
ArtifactPath: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed

0 commit comments

Comments
 (0)