diff --git a/eng/pipelines/jobs/update-tools.yml b/eng/pipelines/jobs/update-tools.yml index b541689b5e..5fb7a3f5c5 100644 --- a/eng/pipelines/jobs/update-tools.yml +++ b/eng/pipelines/jobs/update-tools.yml @@ -1,5 +1,6 @@ parameters: tools: [] + skipPullRequest: false jobs: - ${{ each tool in parameters.tools }}: @@ -10,6 +11,7 @@ jobs: steps: - template: /eng/pipelines/steps/update-dependencies.yml parameters: + skipPullRequest: ${{ parameters.skipPullRequest }} args: > specific 9.0 --tool ${{ tool }} diff --git a/eng/pipelines/steps/update-dependencies-specific.yml b/eng/pipelines/steps/update-dependencies-specific.yml index 754dfe89a1..f11ab2db30 100644 --- a/eng/pipelines/steps/update-dependencies-specific.yml +++ b/eng/pipelines/steps/update-dependencies-specific.yml @@ -1,9 +1,15 @@ parameters: # The customArgsArray parameter is used to specify the configuration for multiple Dockerfile versions. # This allows for a single branch to be generated for different internal .NET build versions. - customArgsArray: "" - - useInternalBuild: false +- name: customArgsArray + type: string + default: "" +- name: useInternalBuild + type: boolean + default: false +- name: skipPullRequest + type: boolean + default: false steps: - script: docker build -t update-dependencies -f $(engPath)/update-dependencies/Dockerfile --pull . @@ -26,7 +32,7 @@ steps: foreach ($customArgs in $customArgsArray) { # If this is the last iteration, include the credentials to cause a PR to be generated. # For internal builds this will cause branch to be pushed to AzDO, but no PRs will be generated. - if ($customArgs -eq $customArgsArray[-1]) { + if ($customArgs -eq $customArgsArray[-1] -and "${{ parameters.skipPullRequest }}" -ne "true") { $customArgs += " $credArgs" } diff --git a/eng/pipelines/steps/update-dependencies.yml b/eng/pipelines/steps/update-dependencies.yml index e6ef95974c..e2ace61df2 100644 --- a/eng/pipelines/steps/update-dependencies.yml +++ b/eng/pipelines/steps/update-dependencies.yml @@ -1,6 +1,7 @@ parameters: serviceConnection: "" args: "" + skipPullRequest: false steps: - script: docker build -t update-dependencies -f $(engPath)/update-dependencies/Dockerfile --pull . @@ -21,9 +22,12 @@ steps: - powershell: | $args = "${{ parameters.args }}".Trim(); - $pat="$(BotAccount-dotnet-docker-bot-PAT)"; - $credArgs = "--user $(dotnetDockerBot.userName) --email $(dotnetDockerBot.email) --password $pat"; - $args += " $credArgs"; + + if ("${{ parameters.skipPullRequest }}" -ne "true") { + $pat="$(BotAccount-dotnet-docker-bot-PAT)"; + $credArgs = "--user $(dotnetDockerBot.userName) --email $(dotnetDockerBot.email) --password $pat"; + $args += " $credArgs"; + } $command = "docker exec update-dependencies update-dependencies $args"; Write-Host "Executing '$command'"; diff --git a/eng/pipelines/steps/update-dotnet-dependencies-specific.yml b/eng/pipelines/steps/update-dotnet-dependencies-specific.yml index ac08179649..0d22341d72 100644 --- a/eng/pipelines/steps/update-dotnet-dependencies-specific.yml +++ b/eng/pipelines/steps/update-dotnet-dependencies-specific.yml @@ -1,10 +1,9 @@ parameters: useInternalBuild: false - # Comma-delimited list of SDK versions to target (overrides the use of channel var to determine latest version) sdkVersions: "" - buildId: "" + skipPullRequest: false steps: - powershell: | @@ -86,4 +85,5 @@ steps: - template: update-dependencies-specific.yml parameters: customArgsArray: "$(customArgsArray)" + skipPullRequest: ${{ parameters.skipPullRequest }} useInternalBuild: ${{ parameters.useInternalBuild }} diff --git a/eng/pipelines/steps/update-dotnet-dependencies.yml b/eng/pipelines/steps/update-dotnet-dependencies.yml index fff0519df0..ff7ff729a7 100644 --- a/eng/pipelines/steps/update-dotnet-dependencies.yml +++ b/eng/pipelines/steps/update-dotnet-dependencies.yml @@ -3,10 +3,12 @@ parameters: channel: "" repo: "https://github.com/dotnet/dotnet" versionSourceName: "" + skipPullRequest: false steps: - template: update-dependencies.yml parameters: args: "from-channel ${{ parameters.channel }} ${{ parameters.repo }} --version-source-name '${{ parameters.versionSourceName }}'" + skipPullRequest: ${{ parameters.skipPullRequest }} useInternalBuild: false serviceConnection: ${{ parameters.serviceConnection }} diff --git a/eng/pipelines/update-dependencies-internal.yml b/eng/pipelines/update-dependencies-internal.yml index 32f274721d..0369504221 100644 --- a/eng/pipelines/update-dependencies-internal.yml +++ b/eng/pipelines/update-dependencies-internal.yml @@ -1,6 +1,12 @@ trigger: none pr: none +parameters: + - name: skipPullRequest + displayName: Skip Pull Request + type: boolean + default: false + variables: - template: ../common/templates/variables/dotnet/common.yml - group: DotNet-AllOrgs-Darc-Pats @@ -14,5 +20,6 @@ stages: steps: - template: steps/update-dotnet-dependencies-specific.yml parameters: + skipPullRequest: ${{ parameters.skipPullRequest }} useInternalBuild: true buildId: $(buildId) diff --git a/eng/pipelines/update-dependencies-monitor.yml b/eng/pipelines/update-dependencies-monitor.yml index 266965bdfb..c86e8e43c3 100644 --- a/eng/pipelines/update-dependencies-monitor.yml +++ b/eng/pipelines/update-dependencies-monitor.yml @@ -14,6 +14,13 @@ resources: - real signed trigger: none pr: none + +parameters: + - name: skipPullRequest + displayName: Skip Pull Request + type: boolean + default: false + variables: - template: ../common/templates/variables/dotnet/common.yml stages: @@ -49,3 +56,4 @@ stages: - template: steps/update-dependencies-specific.yml parameters: customArgsArray: $(customArgsArray) + skipPullRequest: ${{ parameters.skipPullRequest }} diff --git a/eng/pipelines/update-dependencies.yml b/eng/pipelines/update-dependencies.yml index 6147d9fdb5..b6d8f444dd 100644 --- a/eng/pipelines/update-dependencies.yml +++ b/eng/pipelines/update-dependencies.yml @@ -8,6 +8,12 @@ schedules: - nightly always: true +parameters: + - name: skipPullRequest + displayName: Skip Pull Request + type: boolean + default: false + variables: - template: ../common/templates/variables/dotnet/common.yml @@ -25,6 +31,8 @@ stages: repo: "https://github.com/dotnet/dotnet" versionSourceName: "dotnet/dotnet" serviceConnection: "Darc: Maestro Production" + skipPullRequest: ${{ parameters.skipPullRequest }} - template: jobs/update-tools.yml parameters: tools: ["chisel", "rocks-toolbox", "syft", "mingit"] + skipPullRequest: ${{ parameters.skipPullRequest }}