File tree Expand file tree Collapse file tree 4 files changed +24
-12
lines changed Expand file tree Collapse file tree 4 files changed +24
-12
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ variables:
3131 - template : ci/variables/build.yml@eng
3232 - template : ci/variables/cfs.yml@eng
3333 - name : codeql.language
34- value : java,powershell
34+ value : java,powershell,csharp
3535 - name : codeql.buildIdentifier
3636 value : java_worker_official
3737 - name : codeql.excludePathPatterns
@@ -53,10 +53,13 @@ extends:
5353 - stage : TestWindows
5454 dependsOn : Build
5555 jobs :
56- - template : /eng/ci/templates/official/jobs/run-e2e-tests-windows.yml@self
56+ - template : /eng/ci/templates/jobs/run-emulated-tests-windows.yml@self
57+ parameters :
58+ poolName : 1es-pool-azfunc
5759
5860 - stage : TestLinux
59- dependsOn :
60- - TestWindows
61+ dependsOn : Build
6162 jobs :
62- - template : /eng/ci/templates/official/jobs/run-e2e-tests-linux.yml@self
63+ - template : /eng/ci/templates/jobs/run-emulated-tests-linux.yml@self
64+ parameters :
65+ poolName : 1es-pool-azfunc
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ resources:
2626
2727variables :
2828 - name : codeql.language
29- value : java,powershell
29+ value : java,powershell,csharp
3030 - name : codeql.buildIdentifier
3131 value : java_worker_public
3232 - name : codeql.excludePathPatterns
@@ -53,9 +53,12 @@ extends:
5353 dependsOn : Build
5454 jobs :
5555 - template : /eng/ci/templates/jobs/run-emulated-tests-windows.yml@self
56+ parameters :
57+ poolName : 1es-pool-azfunc-public
5658
5759 - stage : TestLinux
58- dependsOn :
59- - TestWindows
60+ dependsOn : Build
6061 jobs :
6162 - template : /eng/ci/templates/jobs/run-emulated-tests-linux.yml@self
63+ parameters :
64+ poolName : 1es-pool-azfunc-public
Original file line number Diff line number Diff line change 1+ parameters :
2+ poolName : ' '
3+
14jobs :
25 - job : " TestLinux"
36 displayName : ' Test java worker - Linux'
47
58 pool :
6- name : 1es-pool-azfunc-public
9+ name : ${{ parameters.poolName }}
710 image : 1es-ubuntu-22.04
811 os : linux
912
1417 ApplicationInsightAgentVersion : 3.5.4
1518
1619 strategy :
17- maxParallel : 1
20+ maxParallel : 4
1821 matrix :
1922 open-jdk-8-linux :
2023 JDK_DOWNLOAD_LINK : ' https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u392b08.tar.gz'
Original file line number Diff line number Diff line change 1+ parameters :
2+ poolName : ' '
3+
14jobs :
25 - job : " TestWindows"
36 displayName : ' Test java worker - Windows'
47
58 pool :
6- name : 1es-pool-azfunc-public
9+ name : ${{ parameters.poolName }}
710 image : 1es-windows-2022
811 os : windows
912
1417 ApplicationInsightAgentVersion : 3.5.4
1518
1619 strategy :
17- maxParallel : 1
20+ maxParallel : 4
1821 matrix :
1922 open-jdk-8-windows :
2023 JDK_DOWNLOAD_LINK : ' https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_x64_windows_hotspot_8u392b08.zip'
You can’t perform that action at this time.
0 commit comments