remove windows 10 and add Server 2022 image#4891
Open
JC-wk wants to merge 4 commits intomicrosoft:mainfrom
Open
remove windows 10 and add Server 2022 image#4891JC-wk wants to merge 4 commits intomicrosoft:mainfrom
JC-wk wants to merge 4 commits intomicrosoft:mainfrom
Conversation
marrobi
previously approved these changes
Apr 1, 2026
Unit Test Results673 tests 673 ✅ 8s ⏱️ Results for commit e519cc4. ♻️ This comment has been updated with latest results. |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the Guacamole Windows VM user-resource templates to remove the deprecated Windows 10 image option, switch defaults to Windows 11, and add Windows Server 2022 Data Science VM support across templates, tests, and docs.
Changes:
- Removed Windows 10 as an image option and set Windows 11 as the default for the Guacamole Windows VM user resource.
- Added “Server 2022 Data Science VM” image option to Windows VM and Airlock import/export review VMs.
- Updated docs, E2E tests, API tests, CHANGELOG, and bumped template/API versions.
Reviewed changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/template_schema.json | Removes Windows 10 from schema enum, adds Server 2022 DSVM, updates default to Windows 11. |
| templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/porter.yaml | Removes Windows 10 image mapping, adds Server 2022 DSVM mapping, bumps template version, updates default. |
| templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/template_schema.json | Adds Server 2022 DSVM as an OS image option for import review VM. |
| templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/porter.yaml | Bumps template version and attempts to add Server 2022 DSVM mapping. |
| templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/template_schema.json | Adds Server 2022 DSVM as an OS image option for export review VM. |
| templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/porter.yaml | Bumps template version and adds Server 2022 DSVM mapping. |
| e2e_tests/test_workspace_services.py | Updates Guacamole Windows VM E2E test to request Windows 11 instead of Windows 10. |
| docs/tre-templates/user-resources/guacamole-windows-vm.md | Updates documentation to reflect Windows 11/Server 2019/Server 2022 support. |
| docs/tre-admins/setup-instructions/installing-workspace-service-and-user-resource.md | Updates example note to reference Windows 11 instead of Windows 10. |
| CHANGELOG.md | Records breaking change (removal of Windows 10) and enhancement (Server 2022 DSVM). |
| api_app/tests_ma/test_db/test_repositories/test_resource_repository.py | Updates template enum expectations to include Windows 11 + Server 2022 DSVM. |
| api_app/tests_ma/test_api/test_routes/test_workspaces.py | Updates template enum expectations to include Windows 11 + Server 2022 DSVM. |
| api_app/_version.py | Bumps API version. |
...ates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/porter.yaml
Outdated
Show resolved
Hide resolved
Collaborator
Author
|
@marrobi not yet tested, but I will be testing today. |
…e-azure-import-reviewvm/porter.yaml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves #4890
What is being addressed
How is this addressed