can't disable

Author: scbedd

eng/pipelines/templates/jobs/ci.yml

@@ -124,21 +124,6 @@ jobs:
       - 'Build_Windows'
       - 'Build_MacOS'
 
-    # Component governance collates discovered dependencies from a combination of
-    # manifest files, splatted json output from CG detections, setup.py files, and other sources.
-    # At this point in the job, we have downloadeded package artifacts from 3 previous platform-specific build jobs,
-    # so the directory that will be published as packages_extended _already contains_ a collated set of dependencies by
-    # json file. When we attempt to publish the packages_extended artifact, CG re-collates data from the current job, but ALSO
-    # includes all the data from json files left behind by the previous jobs. While this doesn't result in double counting,
-    # we've been running into some nasty timeout issues of the CG running on this job specifically.
-    #
-    # Given that we've ALREADY RUN CG on the previous jobs, we can safely disable it here.
-    templateContext:
-      sdl:
-        componentgovernance:
-          enabled: false
-          justificationForDisabling: "We've already run CG on the previous jobs, and we're running into timeout issues due to previous outputs."
-
     timeoutInMinutes: 90
 
     pool:

eng/pipelines/templates/steps/build-extended-artifacts.yml

@@ -88,6 +88,12 @@ steps:
       workingDirectory: $(Pipeline.Workspace)
     displayName: Update package properties with namespaces
 
+  - pwsh: |
+      Get-ChildItem -Path "$(Build.ArtifactStagingDirectory)" -Filter GovCompDisc* | % { Remove-Item $_ }
+      Get-ChildItem -Path "$(Build.ArtifactStagingDirectory)" -Filter ScanTelemetry* | % { Remove-Item $_ }
+      Remove-Item -Recurse -Force -Path "$(Build.ArtifactStagingDirectory)/bcde-output"
+    displayName: Clean up Artifact Directory
+
   - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml
     parameters:
       ArtifactPath: '$(Build.ArtifactStagingDirectory)'