From 376d523cda1f6306c1dedfdaa496e19429d58e02 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:11:33 -0400 Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 8370 (#40486) * PAT Removal from pipeline generation yml * update version of PipelineGenerator to install --------- Co-authored-by: James Suplizio --- .../templates/jobs/prepare-pipelines.yml | 311 +++++++++--------- .../steps/install-pipeline-generation.yml | 2 +- 2 files changed, 164 insertions(+), 149 deletions(-) diff --git a/eng/common/pipelines/templates/jobs/prepare-pipelines.yml b/eng/common/pipelines/templates/jobs/prepare-pipelines.yml index 9cbabda43285b..32427e7e24229 100644 --- a/eng/common/pipelines/templates/jobs/prepare-pipelines.yml +++ b/eng/common/pipelines/templates/jobs/prepare-pipelines.yml @@ -35,166 +35,181 @@ jobs: - template: /eng/common/pipelines/templates/steps/set-default-branch.yml # This covers our public repos. - ${{ if not(endsWith(parameters.Repository, '-pr'))}}: - - script: > - $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate - --organization azure-sdk - --project public - --prefix ${{parameters.Prefix}} - --devopspath "\${{parameters.Prefix}}" - --path $(System.DefaultWorkingDirectory)/sdk - --endpoint Azure - --repository ${{parameters.Repository}} - --convention ci - --agentpool Hosted - --branch refs/heads/$(DefaultBranch) - --patvar PATVAR - --set-managed-variables - --debug - ${{parameters.CIConventionOptions}} + - task: AzureCLI@2 + inputs: + azureSubscription: 'opensource-api-connection' + scriptType: pscore + scriptLocation: inlineScript + inlineScript: + $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate ` + --organization azure-sdk ` + --project public ` + --prefix ${{parameters.Prefix}} ` + --devopspath "\${{parameters.Prefix}}" ` + --path $(System.DefaultWorkingDirectory)/sdk ` + --endpoint Azure ` + --repository ${{parameters.Repository}} ` + --convention ci ` + --agentpool Hosted ` + --branch refs/heads/$(DefaultBranch) ` + --set-managed-variables ` + --debug ` + ${{parameters.CIConventionOptions}} displayName: Create CI Pipelines for Public Repository - env: - PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat) - - script: > - $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate - --organization azure-sdk - --project internal - --prefix ${{parameters.Prefix}} - --devopspath "\${{parameters.Prefix}}" - --path $(System.DefaultWorkingDirectory)/sdk - --endpoint Azure - --repository ${{parameters.Repository}} - --convention up - --agentpool Hosted - --branch refs/heads/$(DefaultBranch) - --patvar PATVAR - --set-managed-variables - --debug - ${{parameters.UPConventionOptions}} + - task: AzureCLI@2 + inputs: + azureSubscription: 'opensource-api-connection' + scriptType: pscore + scriptLocation: inlineScript + inlineScript: + $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate ` + --organization azure-sdk ` + --project internal ` + --prefix ${{parameters.Prefix}} ` + --devopspath "\${{parameters.Prefix}}" ` + --path $(System.DefaultWorkingDirectory)/sdk ` + --endpoint Azure ` + --repository ${{parameters.Repository}} ` + --convention up ` + --agentpool Hosted ` + --branch refs/heads/$(DefaultBranch) ` + --set-managed-variables ` + --debug ` + ${{parameters.UPConventionOptions}} displayName: Create UP Pipelines for Public Repository - env: - PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat) - - script: > - $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate - --organization azure-sdk - --project internal - --prefix ${{parameters.Prefix}} - --devopspath "\${{parameters.Prefix}}" - --path $(System.DefaultWorkingDirectory)/sdk - --endpoint Azure - --repository ${{parameters.Repository}} - --convention tests - --agentpool Hosted - --branch refs/heads/$(DefaultBranch) - --patvar PATVAR - --set-managed-variables - --debug - ${{parameters.TestsConventionOptions}} + - task: AzureCLI@2 + inputs: + azureSubscription: 'opensource-api-connection' + scriptType: pscore + scriptLocation: inlineScript + inlineScript: + $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate ` + --organization azure-sdk ` + --project internal ` + --prefix ${{parameters.Prefix}} ` + --devopspath "\${{parameters.Prefix}}" ` + --path $(System.DefaultWorkingDirectory)/sdk ` + --endpoint Azure ` + --repository ${{parameters.Repository}} ` + --convention tests ` + --agentpool Hosted ` + --branch refs/heads/$(DefaultBranch) ` + --set-managed-variables ` + --debug ` + ${{parameters.TestsConventionOptions}} displayName: Create Live Test Pipelines for Public Repository condition: and(succeeded(), ne('${{parameters.TestsConventionOptions}}','')) - env: - PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat) - - script: > - $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate - --organization azure-sdk - --project internal - --prefix ${{parameters.Prefix}} - --devopspath "\${{parameters.Prefix}}" - --path $(System.DefaultWorkingDirectory)/sdk - --endpoint Azure - --repository ${{parameters.Repository}} - --convention testsweekly - --agentpool Hosted - --branch refs/heads/$(DefaultBranch) - --patvar PATVAR - --set-managed-variables - --debug - ${{parameters.TestsConventionOptions}} + - task: AzureCLI@2 + inputs: + azureSubscription: 'opensource-api-connection' + scriptType: pscore + scriptLocation: inlineScript + inlineScript: + $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate ` + --organization azure-sdk ` + --project internal ` + --prefix ${{parameters.Prefix}} ` + --devopspath "\${{parameters.Prefix}}" ` + --path $(System.DefaultWorkingDirectory)/sdk ` + --endpoint Azure ` + --repository ${{parameters.Repository}} ` + --convention testsweekly ` + --agentpool Hosted ` + --branch refs/heads/$(DefaultBranch) ` + --set-managed-variables ` + --debug ` + ${{parameters.TestsConventionOptions}} displayName: Create Weekly (Multi-Cloud) Live Test Pipelines for Public Repository condition: and(succeeded(), ne('${{parameters.TestsConventionOptions}}','')) - env: - PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat) - - script: > - $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate - --organization azure-sdk - --project internal - --prefix ${{parameters.Prefix}} - --devopspath "\${{parameters.Prefix}}" - --path $(System.DefaultWorkingDirectory)/sdk - --endpoint Azure - --repository ${{parameters.Repository}} - --convention upweekly - --agentpool Hosted - --branch refs/heads/$(DefaultBranch) - --patvar PATVAR - --set-managed-variables - --debug - ${{parameters.UPConventionOptions}} + - task: AzureCLI@2 + inputs: + azureSubscription: 'opensource-api-connection' + scriptType: pscore + scriptLocation: inlineScript + inlineScript: + $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate ` + --organization azure-sdk ` + --project internal ` + --prefix ${{parameters.Prefix}} ` + --devopspath "\${{parameters.Prefix}}" ` + --path $(System.DefaultWorkingDirectory)/sdk ` + --endpoint Azure ` + --repository ${{parameters.Repository}} ` + --convention upweekly ` + --agentpool Hosted ` + --branch refs/heads/$(DefaultBranch) ` + --set-managed-variables ` + --debug ` + ${{parameters.UPConventionOptions}} displayName: Create Weekly (Multi-Cloud) Unified Test Pipelines for Public Repository condition: and(succeeded(), eq(${{parameters.GenerateUnifiedWeekly}},true)) - env: - PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat) - # This covers our -pr repositories. - ${{ if endsWith(parameters.Repository, '-pr')}}: - - script: > - $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate - --organization azure-sdk - --project internal - --prefix ${{parameters.Prefix}}-pr - --devopspath "\${{parameters.Prefix}}\pr" - --path $(System.DefaultWorkingDirectory)/sdk - --endpoint Azure - --repository ${{parameters.Repository}} - --convention ci - --agentpool Hosted - --branch refs/heads/$(DefaultBranch) - --patvar PATVAR - --set-managed-variables - --debug - --no-schedule - ${{parameters.CIConventionOptions}} + - task: AzureCLI@2 + inputs: + azureSubscription: 'opensource-api-connection' + scriptType: pscore + scriptLocation: inlineScript + inlineScript: + $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate ` + --organization azure-sdk ` + --project internal ` + --prefix ${{parameters.Prefix}}-pr ` + --devopspath "\${{parameters.Prefix}}\pr" ` + --path $(System.DefaultWorkingDirectory)/sdk ` + --endpoint Azure ` + --repository ${{parameters.Repository}} ` + --convention ci ` + --agentpool Hosted ` + --branch refs/heads/$(DefaultBranch) ` + --set-managed-variables ` + --debug ` + --no-schedule ` + ${{parameters.CIConventionOptions}} displayName: Create CI Pipelines for Private Repository - env: - PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat) - - script: > - $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate - --organization azure-sdk - --project internal - --prefix ${{parameters.Prefix}}-pr - --devopspath "\${{parameters.Prefix}}\pr" - --path $(System.DefaultWorkingDirectory)/sdk - --endpoint Azure - --repository ${{parameters.Repository}} - --convention up - --agentpool Hosted - --branch refs/heads/$(DefaultBranch) - --patvar PATVAR - --set-managed-variables - --debug - --no-schedule - ${{parameters.UPConventionOptions}} + - task: AzureCLI@2 + inputs: + azureSubscription: 'opensource-api-connection' + scriptType: pscore + scriptLocation: inlineScript + inlineScript: + $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate ` + --organization azure-sdk ` + --project internal ` + --prefix ${{parameters.Prefix}}-pr ` + --devopspath "\${{parameters.Prefix}}\pr" ` + --path $(System.DefaultWorkingDirectory)/sdk ` + --endpoint Azure ` + --repository ${{parameters.Repository}} ` + --convention up ` + --agentpool Hosted ` + --branch refs/heads/$(DefaultBranch) ` + --set-managed-variables ` + --debug ` + --no-schedule ` + ${{parameters.UPConventionOptions}} displayName: Create UP Pipelines for Private Repository - env: - PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat) - - script: > - $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate - --organization azure-sdk - --project internal - --prefix ${{parameters.Prefix}}-pr - --devopspath "\${{parameters.Prefix}}\pr" - --path $(System.DefaultWorkingDirectory)/sdk - --endpoint Azure - --repository ${{parameters.Repository}} - --convention tests - --agentpool Hosted - --branch refs/heads/$(DefaultBranch) - --patvar PATVAR - --set-managed-variables - --debug - --no-schedule - ${{parameters.TestsConventionOptions}} + - task: AzureCLI@2 + inputs: + azureSubscription: 'opensource-api-connection' + scriptType: pscore + scriptLocation: inlineScript + inlineScript: + $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate ` + --organization azure-sdk ` + --project internal ` + --prefix ${{parameters.Prefix}}-pr ` + --devopspath "\${{parameters.Prefix}}\pr" ` + --path $(System.DefaultWorkingDirectory)/sdk ` + --endpoint Azure ` + --repository ${{parameters.Repository}} ` + --convention tests ` + --agentpool Hosted ` + --branch refs/heads/$(DefaultBranch) ` + --set-managed-variables ` + --debug ` + --no-schedule ` + ${{parameters.TestsConventionOptions}} displayName: Create Live Test Pipelines for Private Repository condition: and(succeeded(), ne('${{parameters.TestsConventionOptions}}','')) - env: - PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat) diff --git a/eng/common/pipelines/templates/steps/install-pipeline-generation.yml b/eng/common/pipelines/templates/steps/install-pipeline-generation.yml index 8336a27903547..9d857571c5dd7 100644 --- a/eng/common/pipelines/templates/steps/install-pipeline-generation.yml +++ b/eng/common/pipelines/templates/steps/install-pipeline-generation.yml @@ -9,7 +9,7 @@ steps: - script: > dotnet tool install Azure.Sdk.Tools.PipelineGenerator - --version 1.1.0-dev.20221220.1 + --version 1.1.0-dev.20240604.1 --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json --tool-path ${{parameters.ToolPath}} workingDirectory: $(Pipeline.Workspace)/pipeline-generator