Remove commented code

2023-12-05 12:55:13 +00:00 · 2023-12-05 12:55:13 +00:00 · 10691ca38d
--- a/tools/devops/automation/templates/build/api-diff-stage.yml
+++ b/tools/devops/automation/templates/build/api-diff-stage.yml
@ -35,22 +35,6 @@ parameters:
  type: string

 jobs:
-#- job: configure
-#  displayName: 'Configure build'
-#  pool:
-#    vmImage: windows-latest
-
-#  variables:
-#    isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')]
-#    isScheduled: $[eq(variables['Build.Reason'], 'Schedule')]
-#    BRANCH_NAME: $[ replace(variables['Build.SourceBranch'], 'refs/heads/', '') ]
-
-#  steps:
-#  - template: ../common/configure.yml
-#    parameters: 
-#      repositoryAlias: ${{ parameters.repositoryAlias }}
-#      commit: ${{ parameters.commit }}
-#      uploadArtifacts: false

 - ${{ if eq(parameters.pool, 'automatic') }}:
  - job: AgentPoolSelector       # https://docs.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml
@ -72,7 +56,6 @@ jobs:
  dependsOn:
  - ${{ if eq(parameters.pool, 'automatic') }}:
    - AgentPoolSelector
-# - configure
  displayName: 'Detect API changes'
  timeoutInMinutes: 1000
  variables:
@ -113,7 +96,6 @@ jobs:
  displayName: 'Upload / Publish change detection results to VSDrops / GitHub'
  timeoutInMinutes: 1000
  dependsOn: # can start as soon as the api diff is done
-#  - configure
  - api_diff
  condition: succeededOrFailed()
  pool:
--- a/tools/devops/automation/templates/build/build-mac-tests-stage.yml
+++ b/tools/devops/automation/templates/build/build-mac-tests-stage.yml
@ -35,22 +35,6 @@ parameters:
  type: string

 jobs:
-#- job: configure
-#  displayName: 'Configure build'
-#  pool:
-#    vmImage: windows-latest
-
-#  variables:
-#    isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')]
-#    isScheduled: $[eq(variables['Build.Reason'], 'Schedule')]
-#    BRANCH_NAME: $[ replace(variables['Build.SourceBranch'], 'refs/heads/', '') ]
-
-#  steps:
-#  - template: ../common/configure.yml
-#    parameters:
-#      repositoryAlias: ${{ parameters.repositoryAlias }}
-#      commit: ${{ parameters.commit }}
-#      uploadArtifacts: true

 - ${{ if eq(parameters.pool, 'automatic') }}:
  - job: AgentPoolSelector       # https://docs.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml
@ -69,14 +53,12 @@ jobs:

 # This job builds the macOS tests.
 #
-# - configure: Get the labels from gihub and populate the output.
 # - AgentPoolSelector: If the build was not manually triggered to use a specific pool, this job is used to decide if the build is using a 
 #                      private pool or a public one.
 - job: build_macos_tests_job
  dependsOn:
  - ${{ if eq(parameters.pool, 'automatic') }}:
    - AgentPoolSelector
-#  - configure
  displayName: 'Build macOS tests'
  timeoutInMinutes: 120
  variables:
--- a/tools/devops/automation/templates/build/build-stage.yml
+++ b/tools/devops/automation/templates/build/build-stage.yml
@ -47,23 +47,6 @@ parameters:
  type: string

 jobs:
-#- job: configure
-#  displayName: 'Configure build'
-#  pool:
-#    vmImage: windows-latest
-#
-#  variables:
-#    isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')]
-#    isScheduled: $[eq(variables['Build.Reason'], 'Schedule')]
-#    BRANCH_NAME: $[ replace(variables['Build.SourceBranch'], 'refs/heads/', '') ]
-#
-#  steps:
-#  - template: ../common/configure.yml
-#    parameters: 
-#      repositoryAlias: ${{ parameters.repositoryAlias }}
-#      commit: ${{ parameters.commit }}
-#      uploadArtifacts: true
-
 - ${{ if eq(parameters.pool, 'automatic') }}:
  - job: AgentPoolSelector       # https://docs.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml
    pool:                        # Consider using an agentless (server) job here, but would need to host selection logic as an Azure function: https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=azure-devops&tabs=schema#server
@ -81,14 +64,12 @@ jobs:

 # This job performs the build of the nuget pkgs and the framework pkgs. There are two interesting dependencies in this job:
 #
-# - configure: Get the labels from gihub and populate the output.
 # - AgentPoolSelector: If the build was not manually triggered to use a specific pool, this job is used to decide if the build is using a 
 #                      private pool or a public one.
 - job: build
  dependsOn:
  - ${{ if eq(parameters.pool, 'automatic') }}:
    - AgentPoolSelector
-  #- configure
  displayName: 'Build packages'
  timeoutInMinutes: 1000
  variables:
--- a/tools/devops/automation/templates/mac/stage.yml
+++ b/tools/devops/automation/templates/mac/stage.yml
@ -44,26 +44,7 @@ stages:
    GITHUB_FAILURE_COMMENT_FILE: $(System.DefaultWorkingDirectory)/github-comment-file.md

  jobs:
-#  - job: configure
-#    displayName: 'Configure build'
-#    pool:
-#      vmImage: windows-latest
-#
-#    variables:
-#      isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')]
-#      isScheduled: $[eq(variables['Build.Reason'], 'Schedule')]
-#      BRANCH_NAME: $[ replace(variables['Build.SourceBranch'], 'refs/heads/', '') ]
-#
-#    steps:
-#    - template: ../common/configure.yml
-#      parameters: 
-#        repositoryAlias: ${{ parameters.repositoryAlias }}
-#        commit: ${{ parameters.commit }}
-#        uploadArtifacts: false
-
  - job: run_tests
-#    dependsOn:
-#    - configure
    displayName: 'macOS tests'
    timeoutInMinutes: 1000
    workspace:
--- a/tools/devops/automation/templates/release/vs-insertion-prep.yml
+++ b/tools/devops/automation/templates/release/vs-insertion-prep.yml
@ -42,23 +42,6 @@ stages:
    condition: eq(${{ parameters.isPR }}, false)

  jobs:
-  # - job: configure
-  #   displayName: 'Configure build'
-  #   pool:
-  #     vmImage: windows-latest
-
-  #   variables:
-  #     isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')]
-  #     isScheduled: $[eq(variables['Build.Reason'], 'Schedule')]
-  #     BRANCH_NAME: $[ replace(variables['Build.SourceBranch'], 'refs/heads/', '') ]
-
-  #   steps:
-  #   - template: ../common/configure.yml
-  #     parameters:
-  #       repositoryAlias: ${{ parameters.repositoryAlias }}
-  #       commit: ${{ parameters.commit }}
-  #       uploadArtifacts: false
-
  # Check - "xamarin-macios (Prepare Release Sign NuGets)"
  - template: sign-artifacts/jobs/v2.yml@yaml-templates
    parameters:
--- a/tools/devops/automation/templates/sign-and-notarized/funnel.yml
+++ b/tools/devops/automation/templates/sign-and-notarized/funnel.yml
@ -25,25 +25,7 @@ parameters:
  default: '$(MaciosUploadPrefix)'

 jobs:
-# - job: configure
-#   displayName: 'Configure build'
-#   pool:
-#     vmImage: windows-latest
-
-#   variables:
-#     isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')]
-#     isScheduled: $[eq(variables['Build.Reason'], 'Schedule')]
-#     BRANCH_NAME: $[ replace(variables['Build.SourceBranch'], 'refs/heads/', '') ]
-
-#   steps:
-#   - template: ../common/configure.yml
-#     parameters:
-#       repositoryAlias: ${{ parameters.repositoryAlias }}
-#       commit: ${{ parameters.commit }}
-
 - job: funnel_job
-#  dependsOn:
-#  - configure
  displayName: 'Collect signed artifacts'
  condition: and(not(failed()), not(canceled())) # default is succeded(), but that fails if there are any skipped jobs, so change the condition to !failed && !cancelled
  timeoutInMinutes: 1000
@ -190,7 +172,6 @@ jobs:
  displayName: 'Publish GitHub Comment - Artifacts'
  timeoutInMinutes: 1000
  dependsOn:
-#  - configure
  - upload_azure_blob
  condition: succeededOrFailed()
  variables:
--- a/tools/devops/automation/templates/sign-and-notarized/prepare-pkg-stage.yml
+++ b/tools/devops/automation/templates/sign-and-notarized/prepare-pkg-stage.yml
@ -27,26 +27,9 @@ parameters:
  default: []

 jobs:
-#- job: configure
-#  displayName: 'Configure build'
-#  pool:
-#    vmImage: windows-latest
-#
-#  variables:
-#    isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')]
-#    isScheduled: $[eq(variables['Build.Reason'], 'Schedule')]
-#    BRANCH_NAME: $[ replace(variables['Build.SourceBranch'], 'refs/heads/', '') ]
-#
-#  steps:
-#  - template: ../common/configure.yml
-#    parameters:
-#      repositoryAlias: ${{ parameters.repositoryAlias }}
-#      commit: ${{ parameters.commit }}
-
 - ${{ each pkg in parameters.packages }}:
  - job: ${{ pkg.job }}
    dependsOn:
- #   - configure
    displayName: 'Sign & Notarize ${{ pkg.name }}'
    condition: ne(stageDependencies.configure_build.configure.outputs['configure_platforms.${{ pkg.conditionVariable }}'],'')
    timeoutInMinutes: 1000
--- a/tools/devops/automation/templates/tests/stage.yml
+++ b/tools/devops/automation/templates/tests/stage.yml
@ -96,30 +96,9 @@ stages:
  condition: and(succeeded(), ${{ parameters.condition }})

  jobs:
-#  - ${{ if eq(parameters.parseLabels, true) }}:
-#    - job: configure
-#      displayName: 'Configure build'
-#      pool:
-#        vmImage: windows-latest
-#
-#      variables:
-#        isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')]
-#        isScheduled: $[eq(variables['Build.Reason'], 'Schedule')]
-#        BRANCH_NAME: $[ replace(variables['Build.SourceBranch'], 'refs/heads/', '') ]
-
-#      steps:
-#      - template: ../common/configure.yml
-#        parameters: 
-#          repositoryAlias: ${{ parameters.repositoryAlias }}
-#          commit: ${{ parameters.commit }}
-#          uploadArtifacts: false
-
  - job: "tests"
    ${{ if eq(parameters.parseLabels, true) }}:
      condition: ne(stageDependencies.configure_build.configure.outputs['labels.skip_all_tests'], 'True')
-#    dependsOn:
-#    - ${{ if eq(parameters.parseLabels, true) }}:
-#      - configure
    displayName: 'Running tests:' 
    timeoutInMinutes: 1000
    variables:
@ -177,8 +156,6 @@ stages:
    timeoutInMinutes: 1000
    dependsOn: # has to wait for the tests to be done AND the data to be uploaded
    - tests
-#    - ${{ if eq(parameters.parseLabels, true) }}:
-#      - configure
    variables:
      GIT_HASH: $[ stageDependencies.build_packages.build.outputs['fix_commit.GIT_HASH'] ]
      ${{ each label in parameters.simTestsConfigurations }}:
@ -208,8 +185,6 @@ stages:
      condition: false
    displayName: 'GitHub comment - Skipped tests'
    timeoutInMinutes: 1000
-#    dependsOn: # has to wait for the tests to be done AND the data to be uploaded
-#    - configure

    variables:
      GIT_HASH: $[ stageDependencies.build_packages.build.outputs['fix_commit.GIT_HASH'] ]
--- a/tools/devops/automation/templates/windows/stage.yml
+++ b/tools/devops/automation/templates/windows/stage.yml
@ -41,26 +41,8 @@ stages:
  condition: and(succeeded(), eq(dependencies.configure_build.outputs['configure.decisions.RUN_WINDOWS_TESTS'], 'true'))

  jobs:
-#  - job: configure
-#    displayName: 'Configure build'
-#    pool:
-#      vmImage: windows-latest
-#
-#    variables:
-#      isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')]
-#      isScheduled: $[eq(variables['Build.Reason'], 'Schedule')]
-#      BRANCH_NAME: $[ replace(variables['Build.SourceBranch'], 'refs/heads/', '') ]
-#
-#    steps:
-#    - template: ../common/configure.yml
-#      parameters:
-#        repositoryAlias: ${{ parameters.repositoryAlias }}
-#        commit: ${{ parameters.commit }}
-#        uploadArtifacts: false
-
  - job: mac_reservation
    dependsOn:
-#    - configure
    displayName: "Reserve bot for tests"
    timeoutInMinutes: 1000
    condition: ne(stageDependencies.configure_build.configure.outputs['configure_platforms.ENABLE_DOTNET'],'')
@ -82,7 +64,6 @@ stages:
  - job: run_tests
    dependsOn:
    - mac_reservation
-#    - configure
    displayName: 'Dotnet tests'
    timeoutInMinutes: 1000
    condition: ne(stageDependencies.configure_build.configure.outputs['configure_platforms.ENABLE_DOTNET'],'')