CI Improvement

azure-pipelines.yml

@@ -4,6 +4,13 @@
 
 pool:
   vmImage: 'windows-2019'
+trigger:
+  branches:
+    include:
+      - dev
+      - master
+pr:
+- dev
 
 steps:
 - task: NuGetToolInstaller@0
@@ -34,8 +41,22 @@ steps:
 - pwsh: |
       .\setup-tests-pipeline.ps1
   displayName: 'Setting tests'
+
 - pwsh: |
-      .\build-run-tests-pipeline.ps1
+      $currDir =  Get-Location
+      $Env:Path = $Env:Path+";$currDir\Azure.Functions.Cli"
+      ls $currDir\Azure.Functions.Cli
+      func --version
+      cd ./endtoendtests
+      mvn clean package `-Dmaven`.javadoc`.skip=true `-Dmaven`.test`.skip `-Dorg`.slf4j`.simpleLogger`.log`.org`.apache`.maven`.cli`.transfer`.Slf4jMavenTransferListener=warn `-B
+      Copy-Item "confluent_cloud_cacert.pem" ".\target\azure-functions\azure-functions-java-endtoendtests"
+
+  displayName: 'Package Java for E2E'
+- task: DotNetCoreCLI@2
+  inputs:
+    command: 'test'
+    projects: |
+      endtoendtests\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E.csproj
   env:
     AzureWebJobsStorage: $(AzureWebJobsStorage)
     AzureWebJobsCosmosDBConnectionString: $(AzureWebJobsCosmosDBConnectionString)
@@ -54,8 +75,12 @@ steps:
     AzureWebJobsEventGridOutputBindingTopicKeyString: $(AzureWebJobsEventGridOutputBindingTopicKeyString)
   displayName: 'Build & Run tests for java 8'
   continueOnError: false
-- pwsh: |
-    .\build-run-tests-pipeline.ps1
+
+- task: DotNetCoreCLI@2
+  inputs:
+    command: 'test'
+    projects: |
+      endtoendtests\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E.csproj
   env:
     FUNCTIONS_WORKER_JAVA_LOAD_APP_LIBS: 'True'
     AzureWebJobsStorage: $(AzureWebJobsStorage)
@@ -85,8 +110,12 @@ steps:
     Write-Host "##vso[task.setvariable variable=Java11Home;]$current"
   displayName: 'Setup Java 11 SDK'
   continueOnError: false
-- pwsh: |
-    .\build-run-tests-pipeline.ps1
+
+- task: DotNetCoreCLI@2
+  inputs:
+    command: 'test'
+    projects: |
+      endtoendtests\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E\Azure.Functions.Java.Tests.E2E.csproj
   env:
     JAVA_HOME: $(Java11Home)
     AzureWebJobsStorage: $(AzureWebJobsStorage)
@@ -107,15 +136,9 @@ steps:
     AzureWebJobsEventGridOutputBindingTopicKeyString: $(AzureWebJobsEventGridOutputBindingTopicKeyString)
   displayName: 'Build & Run tests for java 11'
   continueOnError: false
-- task: CopyFiles@2
-  inputs:
-    SourceFolder: '$(System.DefaultWorkingDirectory)/testResults'
-    Contents: '*.trx'
-    TargetFolder: '$(Build.ArtifactStagingDirectory)'
-  displayName: 'Copying test result file for artifacts'
 - task: PublishBuildArtifacts@1
   inputs:
     PathtoPublish: '$(Build.ArtifactStagingDirectory)'
     ArtifactName: 'drop'
     publishLocation: 'Container'
-  displayName: 'Publishing build and test result artifacts'
+  displayName: 'Publishing build artifacts'