Package artifact path (#15512)

* Changes to create artifact in package directory

Author: praveenkuttappan

eng/pipelines/templates/stages/archetype-js-release.yml

@@ -5,7 +5,6 @@ parameters:
   DependsOn: Build
   Registry: 'https://registry.npmjs.org/'
   PrivateRegistry: 'https://pkgs.dev.azure.com/azure-sdk/internal/_packaging/azure-sdk-for-js-pr/npm/registry/'
-  DocArtifact: 'documentation'
   TargetDocRepoOwner: ''
   TargetDocRepoName: ''
   ServiceDirectory: ''
@@ -43,18 +42,13 @@ stages:
                         PackageName: ${{artifact.name}}
                         ServiceName: ${{parameters.ServiceDirectory}}
                         ForRelease: true
-                    - template: /eng/pipelines/templates/steps/stage-artifacts.yml
-                      parameters:
-                        SourceFolder: ${{parameters.ArtifactName}}
-                        TargetFolder: ${{artifact.safeName}}
-                        PackageName: ${{artifact.name}}-[0-9]*.[0-9]*.[0-9]*.tgz
                     - pwsh: |
-                        Get-ChildItem -Recurse $(Pipeline.Workspace)/${{artifact.safeName}}
+                        Get-ChildItem -Recurse ${{parameters.ArtifactName}}/${{artifact.name}}
                       workingDirectory: $(Pipeline.Workspace)
                       displayName: Output Visible Artifacts
                     - template: /eng/common/pipelines/templates/steps/create-tags-and-git-release.yml
                       parameters:
-                        ArtifactLocation: $(Pipeline.Workspace)/${{artifact.safeName}}
+                        ArtifactLocation: $(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}
                         PackageRepository: Npm
                         ReleaseSha: $(Build.SourceVersion)
                         RepoId: Azure/azure-sdk-for-js
@@ -77,7 +71,7 @@ stages:
                     steps:
                       - checkout: self
                       - script: |
-                          export DETECTED_PACKAGE_NAME=`ls $(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}-[0-9]*[0-9]*.[0-9]*.tgz`
+                          export DETECTED_PACKAGE_NAME=`ls $(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}/*.tgz`
                           echo "##vso[task.setvariable variable=Package.Archive]$DETECTED_PACKAGE_NAME"
                         displayName: Detecting package archive
 
@@ -124,13 +118,8 @@ stages:
                   deploy:
                     steps:
                       - checkout: self
-                      - template: /eng/pipelines/templates/steps/stage-artifacts.yml
-                        parameters:
-                          SourceFolder: ${{parameters.ArtifactName}}
-                          TargetFolder: ${{artifact.safeName}}
-                          PackageName: ${{artifact.name}}-[0-9]*.[0-9]*.[0-9]*.tgz
                       - pwsh: |
-                          Get-ChildItem -Recurse $(Pipeline.Workspace)/${{artifact.safeName}}
+                          Get-ChildItem -Recurse ${{parameters.ArtifactName}}/${{artifact.name}}
                         workingDirectory: $(Pipeline.Workspace)
                         displayName: Output Visible Artifacts
                       - template: /eng/common/pipelines/templates/steps/get-pr-owners.yml
@@ -139,7 +128,7 @@ stages:
                           ServiceDirectory: ${{parameters.ServiceDirectory}}
                       - template: /eng/common/pipelines/templates/steps/docs-metadata-release.yml
                         parameters:
-                          ArtifactLocation: $(Pipeline.Workspace)/${{artifact.safeName}}
+                          ArtifactLocation: $(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}
                           PackageRepository: NPM
                           ReleaseSha: $(Build.SourceVersion)
                           RepoId: Azure/azure-sdk-for-js
@@ -171,30 +160,16 @@ stages:
                     steps:
                       - checkout: self
                       - pwsh: |
-                          $adjustedName = "${{artifact.name}}" -replace "^azure-", ""
-                          Write-Host "##vso[task.setvariable variable=Documentation.Zip]$adjustedName"
-                        displayName: Set Documentation File Name
-                      - template: /eng/pipelines/templates/steps/stage-artifacts.yml
-                        parameters:
-                          SourceFolder: ${{parameters.ArtifactName}}
-                          TargetFolder: ${{artifact.safeName}}
-                          PackageName: ${{artifact.name}}-[0-9]*.[0-9]*.[0-9]*.tgz
-                      - template: /eng/pipelines/templates/steps/stage-artifacts.yml
-                        parameters:
-                          SourceFolder: ${{parameters.DocArtifact}}
-                          TargetFolder: ${{artifact.safeName}}/${{parameters.DocArtifact}}
-                          PackageName: $(Documentation.Zip).zip
-                      - pwsh: |
-                          Get-ChildItem -Recurse $(Pipeline.Workspace)/${{artifact.safeName}}
+                          Get-ChildItem -Recurse ${{parameters.ArtifactName}}/${{artifact.name}}
                         workingDirectory: $(Pipeline.Workspace)
                         displayName: Output Visible Artifacts
                       - template: /eng/common/pipelines/templates/steps/publish-blobs.yml
                         parameters:
-                          FolderForUpload: '$(Pipeline.Workspace)/${{artifact.safeName}}'
+                          FolderForUpload: '$(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}'
                           BlobSASKey: '$(azure-sdk-docs-prod-sas)'
                           BlobName: '$(azure-sdk-docs-prod-blob-name)'
                           TargetLanguage: 'javascript'
-                          ArtifactLocation: '$(Pipeline.Workspace)/${{artifact.safeName}}'
+                          ArtifactLocation: '$(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}'
                           # we override the regular script path because we have cloned the build tools repo as a separate artifact.
                           ScriptPath: 'eng/common/scripts/copy-docs-to-blobstorage.ps1'
 
@@ -260,7 +235,7 @@ stages:
         - ${{ each artifact in parameters.Artifacts }}:
           - ${{if ne(artifact.skipPublishDevFeed, 'true')}}:
             - pwsh: |
-                $detectedPackageName=Get-ChildItem $(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}-[0-9]*.[0-9]*.[0-9]*-alpha*.tgz
+                $detectedPackageName=Get-ChildItem $(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}/*.tgz
                 echo "##vso[task.setvariable variable=Package.Archive]$detectedPackageName"
                 if ('$(Build.Repository.Name)' -eq 'Azure/azure-sdk-for-js') {
                   $npmToken="$(azure-sdk-npm-token)"

eng/pipelines/templates/steps/build.yml

@@ -60,28 +60,25 @@ steps:
       Artifacts: ${{ parameters.Artifacts }}
       ArtifactPath: $(Build.SourcesDirectory)/sdk/${{ parameters.ServiceDirectory }}
 
-  # It's important for performance to pass "sdk" as "sourceFolder" rather than as a prefix in "contents".
-  # The task first enumerates all files under "sourceFolder", then matches them against the "contents" pattern.
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: sdk
-      contents: |
-        **/$(coalesceResultFilter)/*.tgz
-        **/$(coalesceResultFilter)/browser/*.zip
-      targetFolder: $(Build.ArtifactStagingDirectory)
-      flattenFolders: true
-    displayName: "Copy packages"
-
-  - template: /eng/common/pipelines/templates/steps/publish-artifact.yml
-    parameters:
-      ArtifactPath: '$(Build.ArtifactStagingDirectory)'
-      ArtifactName: 'packages'
-
   - template: ../steps/generate-doc.yml
     parameters:
       ServiceDirectory: ${{parameters.ServiceDirectory}}
 
+  - pwsh: |
+      $artifacts = '${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json
+      foreach ($artifact in $artifacts)
+      {
+        $artifactName = $artifact.name
+        Write-Host "Copying $artifactName artifacts to $(Build.ArtifactStagingDirectory)/$artifactName"
+        New-Item -Type Directory -Name $artifactName -Path $(Build.ArtifactStagingDirectory) > $null
+        Copy-Item sdk/${{parameters.ServiceDirectory}}/**/$artifactName-*.tgz $(Build.ArtifactStagingDirectory)/$artifactName
+        Copy-Item sdk/${{parameters.ServiceDirectory}}/**/browser/$artifactName-*.zip $(Build.ArtifactStagingDirectory)/$artifactName
+        New-Item -Type Directory -Name documentation -Path $(Build.ArtifactStagingDirectory)/$artifactName > $null
+        Copy-Item $(Build.SourcesDirectory)/docGen/$artifactName.zip $(Build.ArtifactStagingDirectory)/$artifactName/documentation
+      }
+    displayName: 'Copy Packages'
+
   - template: /eng/common/pipelines/templates/steps/publish-artifact.yml
     parameters:
-      ArtifactPath: '$(Build.ArtifactStagingDirectory)/Documentation'
-      ArtifactName: 'documentation'
+      ArtifactPath: '$(Build.ArtifactStagingDirectory)'
+      ArtifactName: 'packages'

eng/pipelines/templates/steps/generate-doc.yml

@@ -16,5 +16,5 @@ steps:
     displayName: "Run Typedoc Docs"
 
   - pwsh: |
-      $(Build.SourcesDirectory)/eng/tools/compress-subfolders.ps1 "$(Build.SourcesDirectory)/docGen" "$(Build.ArtifactStagingDirectory)/Documentation"
+      $(Build.SourcesDirectory)/eng/tools/compress-subfolders.ps1 "$(Build.SourcesDirectory)/docGen" "$(Build.SourcesDirectory)/docGen"
     displayName: "Generate Typedoc Docs"

eng/pipelines/templates/steps/stage-artifacts.yml

@@ -31,6 +31,7 @@ const getChecks = async (dir, checks) => {
         checks.isClient = true;
       }
       checks.version = settings["version"];
+      checks.packageName = settings["name"];
     }
     if (fileName == "typedoc.json") {
       checks.typedocPresent = true;
@@ -99,6 +100,7 @@ const executeTypedoc = async (exclusionList, inclusionList, generateIndexWithTem
             typedocPresent: false,
             isClient: false,
             version: "0",
+            packageName: ""
           };
           eachPackagePath = path.join(eachServicePath, eachPackage);
           pathToAssets = eachPackagePath + "/assets";
@@ -108,23 +110,26 @@ const executeTypedoc = async (exclusionList, inclusionList, generateIndexWithTem
 
             console.log(
               "checks after walk: checks.isPrivate = " +
-                checks.isPrivate +
-                ", checks.srcPresent = " +
-                checks.srcPresent +
-                ", typedocPresent = " +
-                checks.typedocPresent +
-                ", isClient = " +
-                checks.isClient +
-                ", version = " +
-                checks.version
+              checks.isPrivate +
+              ", checks.srcPresent = " +
+              checks.srcPresent +
+              ", typedocPresent = " +
+              checks.typedocPresent +
+              ", isClient = " +
+              checks.isClient +
+              ", version = " +
+              checks.version +
+              ", packageName = " +
+              checks.packageName
             );
             console.log("Path: " + eachPackagePath);
             if (!checks.isPrivate) {
               if ((argv.clientOnly && checks.isClient) || !argv.clientOnly) {
                 if (checks.srcPresent) {
+                  var artifactName = checks.packageName.replace("@", "").replace("/", "-");
                   if (argv.docGenOutput === "dg") {
                     docOutputFolder =
-                      "--out ../../../docGen/" + eachPackage + "/" + checks.version + " ./src";
+                      "--out ../../../docGen/" + artifactName + "/" + checks.version + " ./src";
                   }
 
                   let typedocProcess;