diff --git a/eng/build.yml b/eng/build.yml index f05ba63aeeb..bf4a303274f 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -119,7 +119,6 @@ stages: name: ReleaseConfigs path: release_configs variables: - - group: Publish-Build-Assets - template: /eng/common/templates-official/variables/pool-providers.yml@self pool: name: $(DncEngInternalBuildPool) diff --git a/eng/common-variables.yml b/eng/common-variables.yml index 28da5202913..735a9f02f5b 100644 --- a/eng/common-variables.yml +++ b/eng/common-variables.yml @@ -23,9 +23,7 @@ variables: value: True - name: _SignType value: ${{ parameters.signType }} - # Publish-Build-Assets provides: BotAccount-dotnet-maestro-bot-PAT # DotNet-HelixApi-Access provides: HelixApiAccessToken - - group: Publish-Build-Assets - group: DotNet-HelixApi-Access - group: SDL_Settings - name: _InternalBuildArgs diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 4229288d3d3..075114ba36d 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -58,7 +58,6 @@ jobs: parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: Publish-Build-Assets - group: AzureDevOps-Artifact-Feeds-Pats - name: runCodesignValidationInjection value: false diff --git a/eng/common/core-templates/post-build/common-variables.yml b/eng/common/core-templates/post-build/common-variables.yml index db298ae16ba..a3a8480e254 100644 --- a/eng/common/core-templates/post-build/common-variables.yml +++ b/eng/common/core-templates/post-build/common-variables.yml @@ -1,6 +1,4 @@ variables: - - group: Publish-Build-Assets - # Whether the build is internal or not - name: IsInternalBuild value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index c496f3d0dc7..2c1e0ab1162 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -30,8 +30,6 @@ steps: -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' -runtimeSourceFeed https://ci.dot.net/internal -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' - '$(publishing-dnceng-devdiv-code-r-build-re)' - '$(akams-client-id)' '$(System.AccessToken)' ${{parameters.CustomSensitiveDataList}} continueOnError: true @@ -56,4 +54,3 @@ steps: condition: always() retryCountOnTaskFailure: 10 # for any files being locked isProduction: false # logs are non-production artifacts - diff --git a/eng/publishing/v3/publish.yml b/eng/publishing/v3/publish.yml index 45a16e39987..e1672904919 100644 --- a/eng/publishing/v3/publish.yml +++ b/eng/publishing/v3/publish.yml @@ -13,7 +13,7 @@ stages: timeoutInMinutes: 120 variables: - group: AzureDevOps-Artifact-Feeds-Pats - - group: Publish-Build-Assets + - group: Arcade-Publishing-Client-Ids - template: /eng/common/templates-official/post-build/common-variables.yml@self @@ -116,7 +116,7 @@ stages: scriptType: ps scriptLocation: inlineScript inlineScript: | - # MaestroAppClientId provided by Publish-Build-Assets + # MaestroAppClientId provided by Arcade-Publishing-Client-Ids $token = (az account get-access-token --resource "$(MaestroAppClientId)" | ConvertFrom-Json).accessToken echo "##vso[task.setvariable variable=MaestroToken;isOutput=true;isSecret=true]$token" diff --git a/eng/validate-promotion.yml b/eng/validate-promotion.yml index 1df3a024054..a8cf0f3c940 100644 --- a/eng/validate-promotion.yml +++ b/eng/validate-promotion.yml @@ -17,7 +17,7 @@ jobs: name: ReleaseConfigs path: release_configs variables: - - group: Publish-Build-Assets + - group: Arcade-Promotion-GitHub - template: /eng/common/templates-official/variables/pool-providers.yml@self pool: name: $(DncEngInternalBuildPool) diff --git a/eng/validate-sdk.yml b/eng/validate-sdk.yml index 7fa88dc831c..2ffc6fb8fe7 100644 --- a/eng/validate-sdk.yml +++ b/eng/validate-sdk.yml @@ -22,7 +22,6 @@ jobs: name: Logs_ValidateSdk_Windows_NT_Release timeoutInMinutes: 90 variables: - - group: Publish-Build-Assets - _BuildConfig: ${{ parameters.buildConfig }} - _BuildArgs: ${{ parameters.buildArgs }} - _ValidateBlobFeedUrl: ${{ parameters.validateBlobFeedUrl }} diff --git a/eng/validate-signing.yml b/eng/validate-signing.yml index b45a2695e20..a8d81aab2bf 100644 --- a/eng/validate-signing.yml +++ b/eng/validate-signing.yml @@ -57,7 +57,6 @@ jobs: name: Logs_ValidateSigning_Windows_$(_BuildConfig) timeoutInMinutes: 90 variables: - - group: Publish-Build-Assets - name: TeamName value: DotNetCore - template: /eng/common/templates-official/variables/pool-providers.yml@self @@ -128,7 +127,6 @@ jobs: name: Logs_ValidateSigning_Linux_$(_BuildConfig) timeoutInMinutes: 90 variables: - - group: Publish-Build-Assets - name: TeamName value: DotNetCore - name: _BuildConfig @@ -196,7 +194,6 @@ jobs: name: Logs_ValidateSigning_MacOS_$(_BuildConfig) timeoutInMinutes: 90 variables: - - group: Publish-Build-Assets - name: TeamName value: DotNetCore - name: _BuildConfig