Skip to content

Tests fix #802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 9, 2024
Merged

Tests fix #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
273712e
run emulated tests instead of endtoend tests in official build
ahmedmuhsin Dec 9, 2024
2f170d4
parameterize pool name for emulated tests
ahmedmuhsin Dec 9, 2024
de71001
increase max parallel jobs
ahmedmuhsin Dec 9, 2024
1a0de94
add csharp to list of codeql languages
ahmedmuhsin Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions eng/ci/official-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -53,10 +53,13 @@ extends:
- stage: TestWindows
dependsOn: Build
jobs:
- template: /eng/ci/templates/official/jobs/run-e2e-tests-windows.yml@self
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is run-e2e-tests-windows.yml being used anywhere else or can it be deleted?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not being used anywhere currently but we might use it again in the future. I'll first need to determine how to migrate the rest of the e2e tests to emulated tests. If successful, I'll go ahead and remove the template files.

- 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
9 changes: 6 additions & 3 deletions eng/ci/public-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
7 changes: 5 additions & 2 deletions eng/ci/templates/jobs/run-emulated-tests-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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'
Expand Down
7 changes: 5 additions & 2 deletions eng/ci/templates/jobs/run-emulated-tests-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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'
Expand Down