isolate artifacts from attempted runs (microsoft#187437)

* isolate artifacts from attempted runs

* set ARTIFACT_PREFIX to empty string first

* cleaner

Author: joaomoreno

build/azure-pipelines/alpine/product-build-alpine.yml

@@ -128,23 +128,27 @@ steps:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Build server (web)
 
+  - script: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_"
+    condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues'))
+    displayName: Generate artifact prefix
+
   - publish: $(SERVER_PATH)
-    artifact: vscode_server_alpine_$(VSCODE_ARCH)_archive-unsigned
+    artifact: $(ARTIFACT_PREFIX)vscode_server_alpine_$(VSCODE_ARCH)_archive-unsigned
     displayName: Publish server archive
     condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''), ne(variables['VSCODE_ARCH'], 'x64'))
 
   - publish: $(WEB_PATH)
-    artifact: vscode_web_alpine_$(VSCODE_ARCH)_archive-unsigned
+    artifact: $(ARTIFACT_PREFIX)vscode_web_alpine_$(VSCODE_ARCH)_archive-unsigned
     displayName: Publish web server archive
     condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''), ne(variables['VSCODE_ARCH'], 'x64'))
 
   # Legacy x64 artifact name
   - publish: $(SERVER_PATH)
-    artifact: vscode_server_linux_alpine_archive-unsigned
+    artifact: $(ARTIFACT_PREFIX)vscode_server_linux_alpine_archive-unsigned
     displayName: Publish x64 server archive
     condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''), eq(variables['VSCODE_ARCH'], 'x64'))
 
   - publish: $(WEB_PATH)
-    artifact: vscode_web_linux_alpine_archive-unsigned
+    artifact: $(ARTIFACT_PREFIX)vscode_web_linux_alpine_archive-unsigned
     displayName: Publish x64 web server archive
     condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''), eq(variables['VSCODE_ARCH'], 'x64'))

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -202,6 +202,10 @@ steps:
       condition: and(succeededOrFailed(), eq(variables['BUILT_CLIENT'], 'true'))
       displayName: Package client
 
+    - script: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_"
+      condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues'))
+      displayName: Generate artifact prefix
+
     - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
       displayName: Generate SBOM (client)
       inputs:
@@ -210,7 +214,7 @@ steps:
 
     - publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest
       displayName: Publish SBOM (client)
-      artifact: vscode_client_darwin_$(VSCODE_ARCH)_sbom
+      artifact: $(ARTIFACT_PREFIX)sbom_client_darwin_$(VSCODE_ARCH)_sbom
 
     - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
       displayName: Generate SBOM (server)
@@ -220,19 +224,19 @@ steps:
 
     - publish: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)/_manifest
       displayName: Publish SBOM (server)
-      artifact: vscode_server_darwin_$(VSCODE_ARCH)_sbom
+      artifact: $(ARTIFACT_PREFIX)sbom_server_darwin_$(VSCODE_ARCH)_sbom
 
     - publish: $(CLIENT_PATH)
-      artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
+      artifact: $(ARTIFACT_PREFIX)unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
       condition: and(succeededOrFailed(), ne(variables['CLIENT_PATH'], ''))
       displayName: Publish client archive
 
     - publish: $(SERVER_PATH)
-      artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned
+      artifact: $(ARTIFACT_PREFIX)vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned
       condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''))
       displayName: Publish server archive
 
     - publish: $(WEB_PATH)
-      artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned
+      artifact: $(ARTIFACT_PREFIX)vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned
       condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''))
       displayName: Publish web server archive

build/azure-pipelines/linux/product-build-linux.yml

@@ -235,7 +235,7 @@ steps:
   - ${{ if and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'oss')) }}:
     - task: DownloadPipelineArtifact@2
       inputs:
-        artifact: vscode_cli_linux_$(VSCODE_ARCH)_cli
+        artifact: $(ARTIFACT_PREFIX)vscode_cli_linux_$(VSCODE_ARCH)_cli
         patterns: "**"
         path: $(Build.ArtifactStagingDirectory)/cli
       displayName: Download VS Code CLI
@@ -280,8 +280,9 @@ steps:
     - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll rpm $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) .build/linux/rpm '*.rpm'
       displayName: Codesign rpm
 
-    # - script: ./build/azure-pipelines/linux/prepare-publish.sh
-    #   displayName: Prepare for Publish
+    - script: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_"
+      condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues'))
+      displayName: Generate artifact prefix
 
     - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
       displayName: Generate SBOM (client)
@@ -291,7 +292,7 @@ steps:
 
     - publish: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/_manifest
       displayName: Publish SBOM (client)
-      artifact: vscode_client_linux_$(VSCODE_ARCH)_sbom
+      artifact: $(ARTIFACT_PREFIX)sbom_vscode_client_linux_$(VSCODE_ARCH)
 
     - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
       displayName: Generate SBOM (server)
@@ -301,35 +302,35 @@ steps:
 
     - publish: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)/_manifest
       displayName: Publish SBOM (server)
-      artifact: vscode_server_linux_$(VSCODE_ARCH)_sbom
+      artifact: $(ARTIFACT_PREFIX)sbom_vscode_server_linux_$(VSCODE_ARCH)
 
     - publish: $(CLIENT_PATH)
-      artifact: vscode_client_linux_$(VSCODE_ARCH)_archive-unsigned
+      artifact: $(ARTIFACT_PREFIX)vscode_client_linux_$(VSCODE_ARCH)_archive-unsigned
       condition: and(succeededOrFailed(), ne(variables['CLIENT_PATH'], ''))
       displayName: Publish client archive
 
     - publish: $(SERVER_PATH)
-      artifact: vscode_server_linux_$(VSCODE_ARCH)_archive-unsigned
+      artifact: $(ARTIFACT_PREFIX)vscode_server_linux_$(VSCODE_ARCH)_archive-unsigned
       condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''))
       displayName: Publish server archive
 
     - publish: $(WEB_PATH)
-      artifact: vscode_web_linux_$(VSCODE_ARCH)_archive-unsigned
+      artifact: $(ARTIFACT_PREFIX)vscode_web_linux_$(VSCODE_ARCH)_archive-unsigned
       condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''))
       displayName: Publish web server archive
 
     - publish: $(DEB_PATH)
-      artifact: vscode_client_linux_$(VSCODE_ARCH)_deb-package
+      artifact: $(ARTIFACT_PREFIX)vscode_client_linux_$(VSCODE_ARCH)_deb-package
       condition: and(succeededOrFailed(), ne(variables['DEB_PATH'], ''))
       displayName: Publish deb package
 
     - publish: $(RPM_PATH)
-      artifact: vscode_client_linux_$(VSCODE_ARCH)_rpm-package
+      artifact: $(ARTIFACT_PREFIX)vscode_client_linux_$(VSCODE_ARCH)_rpm-package
       condition: and(succeededOrFailed(), ne(variables['RPM_PATH'], ''))
       displayName: Publish rpm package
 
     - publish: $(SNAP_PATH)
-      artifact: snap-$(VSCODE_ARCH)
+      artifact: $(ARTIFACT_PREFIX)snap-$(VSCODE_ARCH)
       condition: and(succeededOrFailed(), ne(variables['SNAP_PATH'], ''))
       displayName: Publish snap pre-package
 

build/azure-pipelines/product-build.yml

@@ -136,6 +136,8 @@ variables:
     value: true
   - name: Codeql.SkipTaskAutoInjection
     value: true
+  - name: ARTIFACT_PREFIX
+    value: ''
 
 name: "$(Date:yyyyMMdd).$(Rev:r) (${{ parameters.VSCODE_QUALITY }})"
 

build/azure-pipelines/web/product-build-web.yml

@@ -139,7 +139,11 @@ steps:
         node build/azure-pipelines/upload-nlsmetadata
     displayName: Upload NLS Metadata
 
+  - script: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_"
+    condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues'))
+    displayName: Generate artifact prefix
+
   - publish: $(WEB_PATH)
-    artifact: vscode_web_linux_standalone_archive-unsigned
+    artifact: $(ARTIFACT_PREFIX)vscode_web_linux_standalone_archive-unsigned
     condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''))
     displayName: Publish web archive

build/azure-pipelines/win32/product-build-win32.yml

@@ -299,6 +299,10 @@ steps:
           echo "##vso[task.setvariable variable=USER_SETUP_PATH]$SetupPath"
         displayName: Build user setup
 
+      - powershell: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_"
+        condition: and(succeededOrFailed(), notIn(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues'))
+        displayName: Generate artifact prefix
+
       - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
         displayName: Generate SBOM (client)
         inputs:
@@ -307,7 +311,7 @@ steps:
 
       - publish: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)/_manifest
         displayName: Publish SBOM (client)
-        artifact: vscode_client_win32_$(VSCODE_ARCH)_sbom
+        artifact: $(ARTIFACT_PREFIX)sbom_client_win32_$(VSCODE_ARCH)
 
       - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
         displayName: Generate SBOM (server)
@@ -318,30 +322,30 @@ steps:
 
       - publish: $(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)/_manifest
         displayName: Publish SBOM (server)
-        artifact: vscode_server_win32_$(VSCODE_ARCH)_sbom
+        artifact: $(ARTIFACT_PREFIX)sbom_server_win32_$(VSCODE_ARCH)
         condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
 
       - publish: $(CLIENT_PATH)
-        artifact: vscode_client_win32_$(VSCODE_ARCH)_archive
+        artifact: $(ARTIFACT_PREFIX)vscode_client_win32_$(VSCODE_ARCH)_archive
         condition: and(succeededOrFailed(), ne(variables['CLIENT_PATH'], ''))
         displayName: Publish archive
 
       - publish: $(SERVER_PATH)
-        artifact: vscode_server_win32_$(VSCODE_ARCH)_archive
+        artifact: $(ARTIFACT_PREFIX)vscode_server_win32_$(VSCODE_ARCH)_archive
         condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''), ne(variables['VSCODE_ARCH'], 'arm64'))
         displayName: Publish server archive
 
       - publish: $(WEB_PATH)
-        artifact: vscode_web_win32_$(VSCODE_ARCH)_archive
+        artifact: $(ARTIFACT_PREFIX)vscode_web_win32_$(VSCODE_ARCH)_archive
         condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''), ne(variables['VSCODE_ARCH'], 'arm64'))
         displayName: Publish web server archive
 
       - publish: $(SYSTEM_SETUP_PATH)
-        artifact: vscode_client_win32_$(VSCODE_ARCH)_setup
+        artifact: $(ARTIFACT_PREFIX)vscode_client_win32_$(VSCODE_ARCH)_setup
         condition: and(succeededOrFailed(), ne(variables['SYSTEM_SETUP_PATH'], ''))
         displayName: Publish system setup
 
       - publish: $(USER_SETUP_PATH)
-        artifact: vscode_client_win32_$(VSCODE_ARCH)_user-setup
+        artifact: $(ARTIFACT_PREFIX)vscode_client_win32_$(VSCODE_ARCH)_user-setup
         condition: and(succeededOrFailed(), ne(variables['USER_SETUP_PATH'], ''))
         displayName: Publish user setup