Exclude recovery service vaults from e2e tests by disabling backup in… by ChrisChapman-gh · Pull Request #4937 · microsoft/AzureTRE

ChrisChapman-gh · 2026-06-19T10:07:19Z

Resolves #4920

What is being addressed

E2E tests failing to run due to bug in recovery service vaults.

How is this addressed

Added parameter to "properties" payload in e2etests/conftest.py to disable backup (currently enabled by default)

payload = {
    "templateName": template_name,
    "properties": {
        "display_name": f"E2E {description} workspace ({auth_type} AAD)",
        "description": f"{template_name} test workspace for E2E tests",
        "auth_type": auth_type,
        "address_space_size": "small",
        "enable_backup": False
    }
}

duplicating @maxmartin-cgi work so we can get the pipelines running (#4921)

… test workspace configuration

ChrisChapman-gh · 2026-06-19T10:07:35Z

/test-extended

github-actions · 2026-06-19T10:08:03Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/27819357172 (with refid 6dd05385)

(in response to this comment from @ChrisChapman-gh)

github-actions · 2026-06-19T10:08:20Z

Unit Test Results

0 tests 0 ✅ 0s ⏱️
0 suites 0 💤
0 files 0 ❌

Results for commit 813b905.

♻️ This comment has been updated with latest results.

…on template properties

ChrisChapman-gh · 2026-06-19T13:01:27Z

/test-extended

github-actions · 2026-06-19T13:02:24Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/27827269256 (with refid 6dd05385)

(in response to this comment from @ChrisChapman-gh)

…le_backup parameter for backup configuration

ChrisChapman-gh · 2026-06-19T15:07:20Z

/test-extended

github-actions · 2026-06-19T15:07:48Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/27833533227 (with refid 6dd05385)

(in response to this comment from @ChrisChapman-gh)

github-actions · 2026-06-19T16:06:36Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/27833533227 (with refid 6dd05385)

(in response to this comment from @ChrisChapman-gh)

github-actions · 2026-06-19T20:19:30Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/27833533227 (with refid 6dd05385)

(in response to this comment from @ChrisChapman-gh)

github-actions · 2026-06-20T09:04:43Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/27833533227 (with refid 6dd05385)

(in response to this comment from @ChrisChapman-gh)

rudolphjacksonm · 2026-06-22T10:58:50Z

/test-extended

github-actions · 2026-06-22T11:05:02Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/27947827317 (with refid 6dd05385)

(in response to this comment from @rudolphjacksonm)

github-actions · 2026-06-22T15:12:26Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/27947827317 (with refid 6dd05385)

(in response to this comment from @rudolphjacksonm)

rudolphjacksonm · 2026-06-23T06:10:47Z

/test-extended

github-actions · 2026-06-23T06:11:16Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/28006141610 (with refid 6dd05385)

(in response to this comment from @rudolphjacksonm)

github-actions · 2026-06-23T21:30:48Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/28006141610 (with refid 6dd05385)

(in response to this comment from @rudolphjacksonm)

rudolphjacksonm · 2026-06-23T21:57:05Z

/test-destroy-env

github-actions · 2026-06-23T21:58:43Z

Destroying branch test environment (RG: rg-trebbbb4607)... (run: https://github.com/microsoft/AzureTRE/actions/runs/28059838145)

github-actions · 2026-06-23T21:58:44Z

Destroying PR test environment (RG: rg-tre6dd05385)... (run: https://github.com/microsoft/AzureTRE/actions/runs/28059838145)

github-actions · 2026-06-23T21:58:51Z

Branch test environment destroy complete (RG: rg-trebbbb4607)

rudolphjacksonm · 2026-06-23T21:59:21Z

/test-extended

github-actions · 2026-06-23T21:59:45Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/28059957599 (with refid 6dd05385)

(in response to this comment from @rudolphjacksonm)

github-actions · 2026-06-23T22:00:03Z

PR test environment destroy complete (RG: rg-tre6dd05385)

marrobi · 2026-06-24T10:10:47Z

/test-extended

github-actions · 2026-06-24T10:12:01Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/28091206891 (with refid 6dd05385)

(in response to this comment from @marrobi)

rudolphjacksonm · 2026-06-24T13:00:09Z

LGTM

rudolphjacksonm

tests passing now, timeout solved the issue. Will need to look at the broader issue of storage account GUID generation but not in scope for this.

maxmartin-cgi

Looks good to me.

marrobi

LGTM. Thanks.

Copilot

Pull request overview

This PR addresses CI E2E failures related to Recovery Services Vault backups by allowing E2E workspace creation to disable backups when the selected workspace template supports it, and by adding the enable_backup parameter to the Airlock Import Review workspace template.

Changes:

Update E2E workspace creation to conditionally set enable_backup: false based on the workspace template schema.
Add enable_backup to the tre-workspace-airlock-import-review template schema and Porter parameters (and bump its version).
Increase HTTP read timeout used by E2E resource helper calls and document the change in CHANGELOG.md.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
templates/workspaces/airlock-import-review/template_schema.json	Adds `enable_backup` to the workspace template schema (so the API/UI accept the property).
templates/workspaces/airlock-import-review/porter.yaml	Introduces `enable_backup` Porter parameter and passes it into Terraform; bumps template version.
e2e_tests/resources/resource.py	Increases HTTP read timeout for E2E resource operations.
e2e_tests/conftest.py	Conditionally disables backups in the workspace creation payload when supported by the template.
CHANGELOG.md	Adds an unreleased changelog entry for excluding recovery vaults from E2E tests.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

maxmartin-cgi · 2026-06-24T14:02:22Z

/test-force-approve

github-actions · 2026-06-24T14:02:49Z

🤖 pr-bot 🤖

✅ Marking tests as complete (for commit 813b905)

(in response to this comment from @maxmartin-cgi)

Exclude recovery service vaults from e2e tests by disabling backup in…

93343c9

… test workspace configuration

ChrisChapman-gh self-assigned this Jun 19, 2026

Update test workspace creation to conditionally disable backup based …

86e356c

…on template properties

Update Airlock Import Review workspace to version 0.15.0 and add enab…

0a32b82

…le_backup parameter for backup configuration

Increase test request timeout

33beac0

rudolphjacksonm marked this pull request as ready for review June 24, 2026 13:00

rudolphjacksonm requested a review from a team as a code owner June 24, 2026 13:00

Copilot AI review requested due to automatic review settings June 24, 2026 13:00

rudolphjacksonm self-requested a review June 24, 2026 13:00

Copilot started reviewing on behalf of rudolphjacksonm June 24, 2026 13:00 View session

rudolphjacksonm approved these changes Jun 24, 2026

View reviewed changes

maxmartin-cgi approved these changes Jun 24, 2026

View reviewed changes

marrobi approved these changes Jun 24, 2026

View reviewed changes

Copilot AI reviewed Jun 24, 2026

View reviewed changes

Comment thread e2e_tests/conftest.py

Comment thread templates/workspaces/airlock-import-review/template_schema.json Outdated

Apply suggestions from code review

813b905

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

rudolphjacksonm merged commit a0a1ca0 into main Jun 24, 2026
14 checks passed

rudolphjacksonm deleted the 4920-recovery-services-vaults-stopping-cicd-tests-from-running branch June 24, 2026 14:04

This was referenced Jun 24, 2026

Enable soft delete for workspace backup Recovery Services vaults, fix core public IP lifecycle issues, and fix e2e token expiry #4907

Closed

Workspace deployment fails on Recovery Service Vault - TF Provider issue. #4888

Open

Uh oh!

Conversation

ChrisChapman-gh commented Jun 19, 2026

Resolves #4920

What is being addressed

How is this addressed

Uh oh!

ChrisChapman-gh commented Jun 19, 2026

Uh oh!

github-actions Bot commented Jun 19, 2026

Uh oh!

github-actions Bot commented Jun 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Unit Test Results

Uh oh!

ChrisChapman-gh commented Jun 19, 2026

Uh oh!

github-actions Bot commented Jun 19, 2026

Uh oh!

ChrisChapman-gh commented Jun 19, 2026

Uh oh!

github-actions Bot commented Jun 19, 2026

Uh oh!

github-actions Bot commented Jun 19, 2026

Uh oh!

github-actions Bot commented Jun 19, 2026

Uh oh!

github-actions Bot commented Jun 20, 2026

Uh oh!

rudolphjacksonm commented Jun 22, 2026

Uh oh!

github-actions Bot commented Jun 22, 2026

Uh oh!

github-actions Bot commented Jun 22, 2026

Uh oh!

rudolphjacksonm commented Jun 23, 2026

Uh oh!

github-actions Bot commented Jun 23, 2026

Uh oh!

github-actions Bot commented Jun 23, 2026

Uh oh!

rudolphjacksonm commented Jun 23, 2026

Uh oh!

github-actions Bot commented Jun 23, 2026

Uh oh!

github-actions Bot commented Jun 23, 2026

Uh oh!

github-actions Bot commented Jun 23, 2026

Uh oh!

rudolphjacksonm commented Jun 23, 2026

Uh oh!

github-actions Bot commented Jun 23, 2026

Uh oh!

github-actions Bot commented Jun 23, 2026

Uh oh!

marrobi commented Jun 24, 2026

Uh oh!

github-actions Bot commented Jun 24, 2026

Uh oh!

rudolphjacksonm commented Jun 24, 2026

Uh oh!

rudolphjacksonm left a comment

Choose a reason for hiding this comment

Uh oh!

maxmartin-cgi left a comment

Choose a reason for hiding this comment

Uh oh!

marrobi left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

maxmartin-cgi commented Jun 24, 2026

Uh oh!

github-actions Bot commented Jun 24, 2026

github-actions Bot commented Jun 19, 2026 •

edited

Loading