Change storage to drop

tools/devops/automation/build-pipeline.yml

@@ -261,8 +261,6 @@ extends:
             testConfigurations: ${{ parameters.testConfigurations }}
           deviceTestsConfigurations: ${{ parameters.deviceTestsConfigurations }}
           macTestsConfigurations: ${{ parameters.macTestsConfigurations }}
-          azureStorage: ${{ variables['azureStorage'] }}
-          azureContainer: ${{ variables['azureContainer'] }}
           signingSetupSteps:
             - template: ./templates/sign-and-notarized/setup.yml
               parameters:

tools/devops/automation/build-pull-request.yml

@@ -251,8 +251,6 @@ extends:
           testConfigurations: ${{ parameters.testConfigurations }}
         deviceTestsConfigurations: ${{ parameters.deviceTestsConfigurations }}
         macTestsConfigurations: ${{ parameters.macTestsConfigurations }}
-        azureStorage: ${{ variables['azureStorage'] }}
-        azureContainer: ${{ variables['azureContainer'] }}
         signingSetupSteps:
         - template: ./templates/sign-and-notarized/setup.yml
           parameters:

tools/devops/automation/templates/main-stage.yml

@@ -256,12 +256,6 @@ parameters:
       }
     ]
 
-  - name: azureStorage
-    type: string
-
-  - name: azureContainer
-    type: string
-
   - name: stageDisplayNamePrefix
     type: string
     default: ''
@@ -438,8 +432,6 @@ stages:
           isPR: ${{ parameters.isPR }}
           repositoryAlias: ${{ parameters.repositoryAlias }}
           commit: ${{ parameters.commit }}
-          azureStorage: ${{ parameters.azureStorage }}
-          azureContainer: ${{ parameters.azureContainer }}
           packages:  # flatten the pkgs for the parameter
             - ${{ each pkg in parameters.legacyPackageJobs }}:
                 - ${{ pkg }}

tools/devops/automation/templates/pipelines/run-tests-pipeline.yml

@@ -196,6 +196,4 @@ stages:
         testConfigurations: ${{ parameters.testConfigurations }}
       deviceTestsConfigurations: ${{ parameters.deviceTestsConfigurations }}
       macTestsConfigurations: ${{ parameters.macTestsConfigurations }}
-      azureStorage: ${{ variables['azureStorage'] }}
-      azureContainer: ${{ variables['azureContainer'] }}
 

tools/devops/automation/templates/sign-and-notarized/funnel.yml

@@ -14,12 +14,6 @@ parameters:
   type: string
   default: HEAD
 
-- name: azureStorage
-  type: string
-
-- name: azureContainer
-  type: string
-
 - name: uploadPrefix
   type: string
   default: '$(MaciosUploadPrefix)'
@@ -175,8 +169,6 @@ jobs:
       repositoryAlias: ${{ parameters.repositoryAlias }}
       commit: ${{ parameters.commit }}
       sbomFilter: '*.nupkg;*.pkg;*.msi'
-      azureStorage: ${{ parameters.azureStorage }}
-      azureContainer: ${{ parameters.azureContainer }}
 
 # Job that runs on a vm that downloads the artifacts information and adds a github comment pointing to the results of the build.
 - job: artifacts_github_comment

tools/devops/automation/templates/sign-and-notarized/upload-azure.yml

@@ -3,12 +3,6 @@ parameters:
   type: string
   default: '*'            # Supports multiple filters separated by semi-colon such as *.msi;*.nupkg
 
-- name: azureStorage
-  type: string
-
-- name: azureContainer
-  type: string
-
 - name: repositoryAlias
   type: string
   default: self
@@ -68,17 +62,28 @@ steps:
   displayName: "Show downloaded artifacts"
 
 - pwsh: |
-    $packagePrefix = "https://dl.internalx.com/$Env:AZURE_CONTAINER/$Env:VIRTUAL_PATH/package"
+    $DropServiceUrl = "https://devdiv.artifacts.visualstudio.com/DefaultCollection"
+    $StatusDropUrl = "https://vsdrop.microsoft.com/file/v1"
+    $BuildShortHash = "$(Build.SourceVersion)".subString(0, 7)
+    $ProjectPathUrl = "Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$BuildShortHash/$(Build.BuildId)"
+    $PackagePrefix = "$StatusDropUrl/$ProjectPathUrl/${{ parameters.uploadPrefix }}package"
+
+    # Write-Host "##vso[task.setvariable variable=BuildShortHash]$BuildShortHash"
+    # Write-Host "##vso[task.setvariable variable=DropServiceUrl]$DropServiceUrl"
+    Write-Host "##vso[task.setvariable variable=ProjectPathUrl]$ProjectPathUrl"
+    Write-Host "##vso[task.setvariable variable=PackagePrefix]$PackagePrefix"
+  displayName: "Set drop status URL variables"
+
+- pwsh: |
     $files =  Get-ChildItem -Path "$(Build.SourcesDirectory)\\artifacts\\${{ parameters.uploadPrefix }}package" -File -Force -Name
     $manifestFile = "$(Build.SourcesDirectory)\\artifacts\${{ parameters.uploadPrefix }}package\\manifest"
     foreach ($f in $files) {
-      Add-Content -Path "$manifestFile" -Value "$packagePrefix/$f"
+      Add-Content -Path "$manifestFile" -Value "$(PackagePrefix);$f"
     }
-    Add-Content -Path "$manifestFile" -Value "$packagePrefix/$artifacts.json"
-    Add-Content -Path "$manifestFile" -Value "$packagePrefix/manifest"
+    Add-Content -Path "$manifestFile" -Value "$(PackagePrefix);artifacts.json"
+    Add-Content -Path "$manifestFile" -Value "$(PackagePrefix);manifest"
   env:
     VIRTUAL_PATH: $(Build.SourceBranchName)/$(Build.SourceVersion)/$(Build.BuildId)
-    AZURE_CONTAINER: ${{ parameters.azureContainer }}
   displayName: "Build manifest"
 
 # Important needed for the next step
@@ -87,47 +92,6 @@ steps:
     GitHubToken: $(GitHub.Token)
     ArtifactDirectory: $(Build.SourcesDirectory)/${{ parameters.uploadPrefix }}package-internal
 
-- task: AzureFileCopy@6
-  displayName: 'Publish package to Azure'
-  name: upload
-  inputs:
-    SourcePath: $(Build.SourcesDirectory)/artifacts/${{ parameters.uploadPrefix }}package
-    azureSubscription: 'Azure Releng (7b4817ae-218f-464a-bab1-a9df2d99e1e5)'
-    Destination: AzureBlob
-    storage: ${{ parameters.azureStorage }}
-    ContainerName: ${{ parameters.azureContainer }}
-    BlobPrefix: $(Build.SourceBranchName)/$(Build.SourceVersion)/$(Build.BuildId)/${{ parameters.uploadPrefix }}package  # ideally, we would use a variable for this
-
-- task: AzureFileCopy@6
-  displayName: 'Publish manifest to Azure'
-  inputs:
-    SourcePath: $(Build.SourcesDirectory)/artifacts/${{ parameters.uploadPrefix }}package/manifest
-    azureSubscription: 'Azure Releng (7b4817ae-218f-464a-bab1-a9df2d99e1e5)'
-    Destination: AzureBlob
-    storage: ${{ parameters.azureStorage }}
-    ContainerName: ${{ parameters.azureContainer }}
-    BlobPrefix: jenkins/$(Build.SourceBranchName)/$(Build.SourceVersion)
-
-- task: AzureFileCopy@6
-  displayName: 'Publish manifest to Azure as latest'
-  inputs:
-    SourcePath: $(Build.SourcesDirectory)/artifacts/${{ parameters.uploadPrefix }}package/manifest
-    azureSubscription: 'Azure Releng (7b4817ae-218f-464a-bab1-a9df2d99e1e5)'
-    Destination: AzureBlob
-    storage: ${{ parameters.azureStorage }}
-    ContainerName: ${{ parameters.azureContainer }}
-    BlobPrefix: jenkins/$(Build.SourceBranchName)/latest
-
-- task: AzureFileCopy@6
-  displayName: 'Publish manifest to Azure per commit'
-  inputs:
-    SourcePath: $(Build.SourcesDirectory)/artifacts/${{ parameters.uploadPrefix }}package/manifest
-    azureSubscription: 'Azure Releng (7b4817ae-218f-464a-bab1-a9df2d99e1e5)'
-    Destination: AzureBlob
-    storage: ${{ parameters.azureStorage }}
-    ContainerName: ${{ parameters.azureContainer }}
-    BlobPrefix: jenkins/$(Build.SourceVersion)
-
 - pwsh: |
     $execPath="$Env:BUILD_SOURCESDIRECTORY\Xamarin.Build.Tasks\tools\BuildTasks\build-tasks.exe"
 
@@ -145,11 +109,12 @@ steps:
     $execExpression = (
                     "$execPath artifacts" +
                     " -s `"$maciosPath`"" +
-                    " -a $Env:AZURE_STORAGE" +
-                    " -c $Env:STORAGE_PASS" +
+                    " -a AZURE_STORAGE" +
+                    " -c STORAGE_PASS" +
                     " -u `"$Env:AZURE_CONTAINER/$Env:VIRTUAL_PATH/${{ parameters.uploadPrefix }}package`"" +
                     " -d `"$(Build.SourcesDirectory)\\artifacts\${{ parameters.uploadPrefix }}package`"" +
-                    " -o `"$(Build.SourcesDirectory)\\artifacts\${{ parameters.uploadPrefix }}package`""
+                    " -o `"$(Build.SourcesDirectory)\\artifacts\${{ parameters.uploadPrefix }}package`"" +
+                    " -x" # Disable Upload
                     )
 
     Write-Host "Expression is:"
@@ -159,11 +124,18 @@ steps:
   env:
     VIRTUAL_PATH: $(Build.SourceBranchName)/$(Build.SourceVersion)/$(Build.BuildId)
     GITHUB_AUTH_TOKEN: $(GitHub.Token)
-    STORAGE_PASS: $(auth-xamarin-bosstoragemirror-account-key)
-    AZURE_STORAGE: ${{ parameters.azureStorage }}
-    AZURE_CONTAINER: ${{ parameters.azureContainer }}
   displayName: 'Generate artifacts.json'
 
+- task: ms-vscs-artifact.build-tasks.artifactDropTask-1.artifactDropTask@0
+  displayName: 'Publish package to Azure DevOps'
+  inputs:
+    sourcePath: $(Build.SourcesDirectory)/artifacts/${{ parameters.uploadPrefix }}package
+    dropServiceURI: "https://devdiv.artifacts.visualstudio.com/DefaultCollection"
+    buildNumber: $(ProjectPathUrl)
+    dropMetadataContainerName: ${{ parameters.uploadPrefix }}package #TODO
+    retentionDays: 2 #TODO
+    toLowerCase: false
+
 # upload the artifacts.json to the build pipeline artifacts so that it can be consumed by other jobs to
 # get the required urls
 - task: 1ES.PublishPipelineArtifact@1
@@ -184,7 +156,8 @@ steps:
 
     # the azure step sets the env variable, but it points to the wrong url since it uses the one in bosstorage, we
     # need to use the dl version.
-    $pkgsVirtualUrl =  "https://dl.internalx.com/$Env:AZURE_CONTAINER/$Env:VIRTUAL_PATH/${{ parameters.uploadPrefix }}package"
+    $pkgsVirtualUrl = "$(PackagePrefix)"
+    
     Write-Host "Urls is $pkgsVirtualUrl"
 
     $pkgsPath = "$(Build.SourcesDirectory)\\artifacts\\${{ parameters.uploadPrefix }}package"
@@ -291,7 +264,6 @@ steps:
   env:
     GITHUB_TOKEN: $(GitHub.Token)
     ACCESSTOKEN: $(System.AccessToken)
-    AZURE_CONTAINER: ${{ parameters.azureContainer }}
     VIRTUAL_PATH: $(Build.SourceBranchName)/$(Build.SourceVersion)/$(Build.BuildId)
   displayName: 'Set GithubStatus'
 

tools/devops/automation/templates/tests-stage.yml

@@ -231,12 +231,6 @@ parameters:
 - name: macTestsConfigurations
   type: object
 
-- name: azureStorage
-  type: string
-
-- name: azureContainer
-  type: string
-
 - name: stageDisplayNamePrefix
   type: string
   default: ''

tools/devops/automation/templates/variables.yml

@@ -34,10 +34,6 @@ variables:
   value: 'https://devdiv.visualstudio.com/_settings/agentpools?poolId=367&view=agents'
 - name: CIBuild
   value: true
-- name: azureStorage
-  value: 'bosstoragemirror'
-- name: azureContainer
-  value: 'wrench'
 - name: BUILD_REVISION
   value: azure-devops-$(Build.SourceVersion)
 - name: MacPoolAccessToken