Update pipeline generation yaml

Azure · Dec 20, 2022 · c4a52ee · c4a52ee
1 parent b4cebf9
commit c4a52ee
Show file tree

Hide file tree

Showing 3 changed files with 288 additions and 219 deletions.
diff --git a/eng/common/pipelines/templates/jobs/prepare-pipelines.yml b/eng/common/pipelines/templates/jobs/prepare-pipelines.yml
@@ -28,99 +28,99 @@ jobs:
     # This covers our public repos.
     - ${{ if not(endsWith(parameters.Repository, '-pr'))}}:
       - script: >
-          $(Pipeline.Workspace)/pipeline-generator/pipeline-generator
-          --organization https://dev.azure.com/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}}
+          $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
+            --organization https://dev.azure.com/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}}
         displayName: Create CI Pipelines for Public Repository
         env:
           PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
       - script: >
-          $(Pipeline.Workspace)/pipeline-generator/pipeline-generator
-          --organization https://dev.azure.com/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}}
+          $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
+            --organization https://dev.azure.com/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}}
         displayName: Create UP Pipelines for Public Repository
         env:
           PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
       - script: >
-          $(Pipeline.Workspace)/pipeline-generator/pipeline-generator
-          --organization https://dev.azure.com/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}}
+          $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
+            --organization https://dev.azure.com/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}}
         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
-          --organization https://dev.azure.com/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}}
+          $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
+            --organization https://dev.azure.com/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}}
         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
-          --organization https://dev.azure.com/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}}
+          $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
+            --organization https://dev.azure.com/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}}
         displayName: Create Weekly (Multi-Cloud) Unified Test Pipelines for Public Repository
         condition: and(succeeded(), eq(${{parameters.GenerateUnifiedWeekly}},true))
         env:
@@ -130,63 +130,63 @@ jobs:
     # This covers our -pr repositories.
     - ${{ if endsWith(parameters.Repository, '-pr')}}:
       - script: >
-          $(Pipeline.Workspace)/pipeline-generator/pipeline-generator
-          --organization https://dev.azure.com/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}}
+          $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
+            --organization https://dev.azure.com/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}}
         displayName: Create CI Pipelines for Private Repository
         env:
           PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
       - script: >
-          $(Pipeline.Workspace)/pipeline-generator/pipeline-generator
-          --organization https://dev.azure.com/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}}
+          $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
+            --organization https://dev.azure.com/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}}
         displayName: Create UP Pipelines for Private Repository
         env:
           PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
       - script: >
-          $(Pipeline.Workspace)/pipeline-generator/pipeline-generator
-          --organization https://dev.azure.com/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}}
+          $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
+            --organization https://dev.azure.com/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}}
         displayName: Create Live Test Pipelines for Private Repository
         condition: and(succeeded(), ne('${{parameters.TestsConventionOptions}}',''))
         env:
-          PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
+          PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)
diff --git a/eng/pipelines/pipeline-generation-single.yml b/eng/pipelines/pipeline-generation-single.yml
@@ -5,8 +5,8 @@
 # RepositoryName - azure-sdk-for-<lang>
 # DevOpsPath - $(Prefix)\pr
 # ServiceDirectory - "", keyvault, storage, etc.
-# PipelineConvention - ci, up, tests
-# AdditionalOptions - potentially add variablegroups via "--variablegroup x"
+# PipelineConvention - ci, up, tests, testsweekly, upweekly
+# AdditionalOptions - potentially add variablegroups via "--variablegroups x"
 
 pr: none
 
@@ -30,20 +30,20 @@ jobs:
       git clone --filter=blob:none --branch $(Branch) https://$(azuresdk-github-pat)@github.com/azure/$(RepositoryName) $(Pipeline.Workspace)/$(RepositoryName)
     displayName: 'Clone repository: $(RepositoryName)'
   - script: >
-      $(Pipeline.Workspace)/pipeline-generator/pipeline-generator
-      --organization $(DevOpsOrg)
-      --project $(DevOpsProject)
-      --prefix $(Prefix)
-      --devopspath "$(DevOpsPath)"
-      --path $(PathFilter)
-      --endpoint Azure
-      --repository Azure/$(RepositoryName)
-      --convention $(PipelineConvention)
-      --agentpool Hosted
-      --branch refs/heads/$(Branch)
-      --patvar PATVAR
-      --debug
-      $(AdditionalOptions)
+      $(Pipeline.Workspace)/pipeline-generator/pipeline-generator generate
+        --organization $(DevOpsOrg)
+        --project $(DevOpsProject)
+        --prefix $(Prefix)
+        --devopspath "$(DevOpsPath)"
+        --path $(PathFilter)
+        --endpoint Azure
+        --repository Azure/$(RepositoryName)
+        --convention $(PipelineConvention)
+        --agentpool Hosted
+        --branch refs/heads/$(Branch)
+        --patvar PATVAR
+        --debug
+        $(AdditionalOptions)
     displayName: 'Generate pipeline'
     env:
       PATVAR: $(azuresdk-azure-sdk-devops-pipeline-generation-pat)