From 3fabf97c91a3e3b64c38cb9a22b843df99ae6450 Mon Sep 17 00:00:00 2001 From: James Suplizio Date: Fri, 17 Feb 2023 12:28:45 -0800 Subject: [PATCH] Fix Java Dev Feed Publish (#33582) * Fix Java Dev Feed Publish * move spring and resource manager to ESRP release --- .../stages/archetype-java-release-batch.yml | 28 +++++++++---------- .../templates/steps/java-publishing.yml | 12 ++++---- sdk/resourcemanager/ci.yml | 1 - sdk/spring/ci.yml | 1 - 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-java-release-batch.yml b/eng/pipelines/templates/stages/archetype-java-release-batch.yml index 1f7bd4e7006be..a8b8aefaa66e8 100644 --- a/eng/pipelines/templates/stages/archetype-java-release-batch.yml +++ b/eng/pipelines/templates/stages/archetype-java-release-batch.yml @@ -224,20 +224,20 @@ stages: parameters: ArtifactName: ${{parameters.ArtifactName}}-mavencentral-$(System.JobAttempt) ArtifactPath: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed - # After publishing to Maven, publish to the azure-sdk-for-java feed. The reason for - # this is that the azure-sdk-for-java feed will have the package available immediately - # whereas Maven can take several hours for the package to become available. - - template: /eng/pipelines/templates/steps/java-publishing.yml - parameters: - ArtifactDirectory: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed - RepositoryUrl: https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-java/maven/v1 - Target: JavaDevFeed - BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools - JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java - - template: /eng/common/pipelines/templates/steps/publish-artifact.yml - parameters: - ArtifactName: ${{parameters.ArtifactName}}-javadevfeed-$(System.JobAttempt) - ArtifactPath: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed + # After publishing to Maven, publish to the azure-sdk-for-java feed. The reason for + # this is that the azure-sdk-for-java feed will have the package available immediately + # whereas Maven can take several hours for the package to become available. + - template: /eng/pipelines/templates/steps/java-publishing.yml + parameters: + ArtifactDirectory: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed + RepositoryUrl: https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-java/maven/v1 + Target: JavaDevFeed + BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools + JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java + - template: /eng/common/pipelines/templates/steps/publish-artifact.yml + parameters: + ArtifactName: ${{parameters.ArtifactName}}-javadevfeed-$(System.JobAttempt) + ArtifactPath: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed - deployment: UpdatePackageVersion displayName: "Update Package Version" diff --git a/eng/pipelines/templates/steps/java-publishing.yml b/eng/pipelines/templates/steps/java-publishing.yml index b0d7ffb6b99aa..52e1688fc5147 100644 --- a/eng/pipelines/templates/steps/java-publishing.yml +++ b/eng/pipelines/templates/steps/java-publishing.yml @@ -19,8 +19,8 @@ steps: filePath: ${{ parameters.JavaRepoRoot }}/eng/scripts/Publish-MavenPackages.ps1 arguments: > -ArtifactDirectory ${{ parameters.ArtifactDirectory }} - -GroupIDFilter ${{ parameters.GroupID }} - -ArtifactIDFilter ${{ parameters.ArtifactID }} + -GroupIDFilter "${{ parameters.GroupID }}" + -ArtifactIDFilter "${{ parameters.ArtifactID }}" -RepositoryUrl https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-$(Build.BuildID)/maven/v1 -RepositoryUsername nobody -RepositoryPassword $(System.AccessToken) @@ -37,8 +37,8 @@ steps: filePath: ${{ parameters.JavaRepoRoot }}/eng/scripts/Publish-MavenPackages.ps1 arguments: > -ArtifactDirectory ${{ parameters.ArtifactDirectory }} - -GroupIDFilter ${{ parameters.GroupID }} - -ArtifactIDFilter ${{ parameters.ArtifactID }} + -GroupIDFilter "${{ parameters.GroupID }}" + -ArtifactIDFilter "${{ parameters.ArtifactID }}" -RepositoryUrl ${{ parameters.RepositoryUrl }} -RepositoryUsername nobody -RepositoryPassword $(System.AccessToken) @@ -55,8 +55,8 @@ steps: filePath: ${{ parameters.JavaRepoRoot }}/eng/scripts/Publish-MavenPackages.ps1 arguments: > -ArtifactDirectory ${{ parameters.ArtifactDirectory }} - -GroupIDFilter ${{ parameters.GroupID }} - -ArtifactIDFilter ${{ parameters.ArtifactID }} + -GroupIDFilter "${{ parameters.GroupID }}" + -ArtifactIDFilter "${{ parameters.ArtifactID }}" -RepositoryUrl https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-android/maven/v1 -RepositoryUsername nobody -RepositoryPassword $(System.AccessToken) diff --git a/sdk/resourcemanager/ci.yml b/sdk/resourcemanager/ci.yml index f7bc4d76d3e85..8d791f83c1a35 100644 --- a/sdk/resourcemanager/ci.yml +++ b/sdk/resourcemanager/ci.yml @@ -182,7 +182,6 @@ extends: parameters: ServiceDirectory: resourcemanager EnableBatchRelease: true - UseEsrpRelease: false Artifacts: - name: azure-resourcemanager groupId: com.azure.resourcemanager diff --git a/sdk/spring/ci.yml b/sdk/spring/ci.yml index 926cc09131df5..3dd53c542886a 100644 --- a/sdk/spring/ci.yml +++ b/sdk/spring/ci.yml @@ -229,7 +229,6 @@ extends: parameters: ServiceDirectory: spring EnableBatchRelease: true - UseEsrpRelease: false Artifacts: - name: spring-cloud-azure-core groupId: com.azure.spring