Use common API create template and reorder step exeuction (Azure#19771)

* Use common API review create step and reorder step

Author: praveenkuttappan

eng/pipelines/templates/jobs/ci.yml

@@ -117,16 +117,17 @@ jobs:
             -TargetDirectory $(Build.ArtifactStagingDirectory)
             -InformationAction Continue
 
-      - publish: $(Build.ArtifactStagingDirectory)
-        displayName: 'Publish Artifacts $(ArtifactName)'
-        artifact: '$(ArtifactName)'
-
-      - template: ../steps/upload-repository-on-failure.yml
-
-      - template: /eng/pipelines/templates/steps/create-apireview.yml
+      - template: /eng/common/pipelines/templates/steps/create-apireview.yml
         parameters:
           Artifacts: ${{parameters.Artifacts}}
 
+      - template: /eng/common/pipelines/templates/steps/publish-artifact.yml
+        parameters:
+          ArtifactPath: $(Build.ArtifactStagingDirectory)
+          ArtifactName: '$(ArtifactName)'
+
+      - template: ../steps/upload-repository-on-failure.yml
+
   - job: 'Analyze'
     condition: and(succeeded(), ne(variables['Skip.Analyze'], 'true'))
 

eng/pipelines/templates/steps/create-apireview.yml

@@ -243,19 +243,21 @@ function Update-java-CIConfig($pkgs, $ciRepo, $locationInDocRepo, $monikerId=$nu
 }
 
 # function is used to filter packages to submit to API view tool
-function Find-java-Artifacts-For-Apireview($artifactDir, $pkgName = "")
+function Find-java-Artifacts-For-Apireview($artifactDir, $pkgName)
 {
-  Write-Host "Checking for source jar in artifact path $($artifactDir)"
   # Find all source jar files in given artifact directory
-  $files = Get-ChildItem "${artifactDir}" | Where-Object -FilterScript {$_.Name.EndsWith("sources.jar")}
+  # Filter for package in "com.azure*" groupid.
+  $artifactPath = Join-Path $artifactDir "com.azure*" $pkgName
+  Write-Host "Checking for source jar in artifact path $($artifactPath)"
+  $files = Get-ChildItem -Recurse "${artifactPath}" | Where-Object -FilterScript {$_.Name.EndsWith("sources.jar")}
   if (!$files)
   {
-    Write-Host "$($artifactDir) does not have any package"
+    Write-Host "$($artifactPath) does not have any package"
     return $null
   }
   elseif($files.Count -ne 1)
   {
-    Write-Host "$($artifactDir) should contain only one (1) published source jar package"
+    Write-Host "$($artifactPath) should contain only one (1) published source jar package"
     Write-Host "No of Packages $($files.Count)"
     return $null
   }