Tests fix (#802)

* run emulated tests instead of endtoend tests in official build * parameterize pool name for emulated tests * increase max parallel jobs * add csharp to list of codeql languages
Azure · Dec 9, 2024 · db12979 · db12979
1 parent 63f4f00
commit db12979
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/eng/ci/official-build.yml b/eng/ci/official-build.yml
@@ -31,7 +31,7 @@ variables:
   - template: ci/variables/build.yml@eng
   - template: ci/variables/cfs.yml@eng
   - name: codeql.language
-    value: java,powershell
+    value: java,powershell,csharp
   - name: codeql.buildIdentifier
     value: java_worker_official
   - name: codeql.excludePathPatterns
@@ -53,10 +53,13 @@ extends:
       - stage: TestWindows
         dependsOn: Build
         jobs:
-          - template: /eng/ci/templates/official/jobs/run-e2e-tests-windows.yml@self
+          - template: /eng/ci/templates/jobs/run-emulated-tests-windows.yml@self
+            parameters:
+              poolName: 1es-pool-azfunc
 
       - stage: TestLinux
-        dependsOn:
-          - TestWindows
+        dependsOn: Build
         jobs:
-          - template: /eng/ci/templates/official/jobs/run-e2e-tests-linux.yml@self
+          - template: /eng/ci/templates/jobs/run-emulated-tests-linux.yml@self
+            parameters:
+              poolName: 1es-pool-azfunc
diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml
@@ -26,7 +26,7 @@ resources:
 
 variables:
   - name: codeql.language
-    value: java,powershell
+    value: java,powershell,csharp
   - name: codeql.buildIdentifier
     value: java_worker_public
   - name: codeql.excludePathPatterns
@@ -53,9 +53,12 @@ extends:
         dependsOn: Build
         jobs:
           - template: /eng/ci/templates/jobs/run-emulated-tests-windows.yml@self
+            parameters:
+              poolName: 1es-pool-azfunc-public
 
       - stage: TestLinux
-        dependsOn:
-          - TestWindows
+        dependsOn: Build
         jobs:
           - template: /eng/ci/templates/jobs/run-emulated-tests-linux.yml@self
+            parameters:
+              poolName: 1es-pool-azfunc-public
diff --git a/eng/ci/templates/jobs/run-emulated-tests-linux.yml b/eng/ci/templates/jobs/run-emulated-tests-linux.yml
@@ -1,9 +1,12 @@
+parameters:
+  poolName: ''
+
 jobs:
   - job: "TestLinux"
     displayName: 'Test java worker - Linux'
 
     pool:
-      name: 1es-pool-azfunc-public
+      name: ${{ parameters.poolName }}
       image: 1es-ubuntu-22.04
       os: linux
 
@@ -14,7 +17,7 @@ jobs:
       ApplicationInsightAgentVersion: 3.5.4
 
     strategy:
-      maxParallel: 1
+      maxParallel: 4
       matrix:
         open-jdk-8-linux:
           JDK_DOWNLOAD_LINK: 'https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u392b08.tar.gz'

diff --git a/eng/ci/templates/jobs/run-emulated-tests-windows.yml b/eng/ci/templates/jobs/run-emulated-tests-windows.yml
@@ -1,9 +1,12 @@
+parameters:
+  poolName: ''
+
 jobs:
   - job: "TestWindows"
     displayName: 'Test java worker - Windows'
 
     pool:
-      name: 1es-pool-azfunc-public
+      name: ${{ parameters.poolName }}
       image: 1es-windows-2022
       os: windows
 
@@ -14,7 +17,7 @@ jobs:
       ApplicationInsightAgentVersion: 3.5.4
 
     strategy:
-      maxParallel: 1
+      maxParallel: 4
       matrix:
         open-jdk-8-windows:
           JDK_DOWNLOAD_LINK: 'https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_x64_windows_hotspot_8u392b08.zip'