Move corefx to stages, use arcade's package artifacts convention (dot…

…net/corefx#40124) * Move corefx to stages, use package artifacts convention start transition to use arcade publish tasks * Update arcade dependencies from build 20190808.13 Commit migrated from dotnet/corefx@0712701
hgdiaz · Aug 9, 2019 · 679ac6b · 679ac6b
1 parent 3b91c9b
commit 679ac6b
Show file tree

Hide file tree

Showing 12 changed files with 535 additions and 673 deletions.
diff --git a/eng/pipelines/libraries/.azure-ci.yml b/eng/pipelines/libraries/.azure-ci.yml
@@ -43,7 +43,19 @@ resources:
   - container: ubuntu_1604_arm_cross_container
     image: microsoft/dotnet-buildtools-prereqs:ubuntu-16.04-cross-ef0ac75-20175511035548
 
-jobs:
+variables:
+  - ${{ if and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}:
+    - group: DotNet-Blob-Feed
+    - name: _dotnetFeedUrl
+      value: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
+    - name: _PublishUsingPipelines
+      value: true
+    - name: _DotNetArtifactsCategory
+      value: .NETCore
+    - name: _DotNetValidationArtifactsCategory
+      value: .NETCore
+
+stages:
   # Windows legs
   - template: /eng/pipelines/windows.yml
     parameters:
@@ -68,14 +80,19 @@ jobs:
     #     isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
     #     fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}
 
-  # Publish step. Only run in official builds
+  # Publish and validation steps. Only run in official builds
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}:
-    - template: /eng/pipelines/publish.yml
+    - template: /eng/pipelines/pre-publish.yml
       parameters:
         dependsOn:
-          - WindowsTest
-          - WindowsNoTest
-          - AllConfigurations
-          - LinuxTest
-          - MacOS
+          - WindowsStage
+          - LinuxStage
+          - MacOSStage
           # - FreeBSD
+
+    - template: eng\common\templates\post-build\post-build.yml
+      parameters:
+        dependsOn:
+          - PrePublish
+        enableSymbolValidation: false # https://github.com/dotnet/arcade/issues/2871
+        enableSourceLinkValidation: false # https://github.com/dotnet/arcade/issues/3603
diff --git a/eng/pipelines/libraries/corefx-base.yml b/eng/pipelines/libraries/corefx-base.yml
@@ -80,19 +80,17 @@ jobs:
         - ${{ if ne(parameters.testScope, '') }}:
           - _testScopeArg: -testscope ${{ parameters.testScope }}
 
-        - ${{ if ne(job._jobFramework, '')}}:
-          - _finalFrameworkArg: ${{ job._jobFramework }}
-
         - ${{ if eq(parameters.isOfficialBuild, 'true') }}:
           - _msbuildCommonParameters: /p:OfficialBuildId=$(Build.BuildNumber)
-          - _dotnetFeedUrl: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
-          - group: DotNet-Blob-Feed
 
         - ${{ if eq(job.submitToHelix, 'true') }}:
           - _archiveTestsParameter: /p:ArchiveTests=Tests
           - ${{ if eq(parameters.isOfficialBuild, 'true') }}:
             - group: DotNet-HelixApi-Access
 
+        - ${{ if ne(job.frameworkArg, '') }}:
+          - _finalFrameworkArg: ${{ job.frameworkArg }}
+
         - _args: -configuration $(_BuildConfig) -ci -arch $(_architecture) $(_finalFrameworkArg) $(_archiveTestsParameter) ${{ job.buildExtraArguments }}
         - _commonArguments: $(_args)
 
@@ -137,7 +135,7 @@ jobs:
           - ${{ if eq(parameters.isOfficialBuild, 'true') }}:
             - task: DotNetCoreCLI@2
               displayName: Restore internal tools
-              condition: ne(variables['_skipRestoreInternalTools'], 'true')
+              condition: and(succeeded(), ne(variables['_skipRestoreInternalTools'], 'true'))
               inputs:
                 command: restore
                 feedsToUse: config
@@ -161,8 +159,7 @@ jobs:
 
           - ${{ if eq(job.submitToHelix, 'true') }}:
             - ${{ if eq(parameters.isOfficialBuild, 'true') }}:
-              - script: $(_msbuildCommand) eng/publish.proj
-                      /t:PublishTestAssets
+              - script: $(_msbuildCommand) eng/publishTestAssets.proj
                       /p:FilesToPublishPattern=$(Build.SourcesDirectory)/artifacts/helix/**/*.zip
                       /p:AccountKey=$(dotnetfeed-storage-access-key-1)
                       /p:ExpectedFeedUrl=$(_dotnetFeedUrl)
@@ -184,7 +181,7 @@ jobs:
               - task: PublishBuildArtifacts@1
                 displayName: Publish test asset manifest to artifacts container
                 inputs:
-                  pathToPublish: $(Build.SourcesDirectory)/artifacts/AssetManifests
+                  pathToPublish: $(Build.SourcesDirectory)/artifacts/TestAssetsManifests
                   artifactName: $(Agent.Os)_$(Agent.JobName)
                   artifactType: container
                 condition: and(succeeded(), eq(variables['_publishTests'], 'true'))
@@ -214,7 +211,7 @@ jobs:
             - task: PublishBuildArtifacts@1
               displayName: Publish packages to artifacts container
               inputs:
-                pathToPublish: $(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)
+                pathToPublish: $(Build.SourcesDirectory)/artifacts/packages
                 artifactName: packages
                 artifactType: container
               condition: and(succeeded(), ne(variables['_skipPublishPackages'], 'true'))