Sync eng/common directory with azure-sdk-tools for PR 8370 (#1793)

* PAT Removal from pipeline generation yml * update version of PipelineGenerator to install --------- Co-authored-by: James Suplizio <[email protected]>
Azure · Jun 4, 2024 · ad57a47 · ad57a47
1 parent 1429a26
commit ad57a47
Show file tree

Hide file tree

Showing 2 changed files with 164 additions and 149 deletions.
diff --git 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
@@ -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