Skip to content

subtask/FCT2-22142 Add separate test flow for PRs from development -> main - #597

Merged
lilachdavis merged 5 commits into
mainfrom
development
Sep 25, 2026
Merged

lilachdavis merged 5 commits into
mainfrom
development

Conversation

@lilachdavis

Copy link
Copy Markdown
Contributor

No description provided.

lilachdavis and others added 5 commits September 23, 2026 14:48
* filtering status telemetry (#581)

* filtering status telemetry

* fix nuget

* pr comment fixes

* add version to dotnet build

* deploy envs conditionally, require manualvalidation only for prod

* story/FCT2-20672 : Text content update for the unauthorised page (#584)

* add separate pipeline yaml for development trigger

* unblock E2E Tests in Dev

* test release versioning in dev

* test release versioning in dev

* use var instead of parameter for buildConfiguration

* remove temorary test lines

* task/FCT2-21994 backend test pipeline - rm redundant build job (#585)

* egress delete check all files successful (#586)

* Fct2 21924 bulk delete unknown files (#587)

* deletion of unexisting files

* deletion of existing files

* update parameter empty string value option

* trigger integration tests only for debelopment

* rm unused parameters, fix stage dependency

* fix stage dependency

---------

Co-authored-by: Rhys Bridges <rhys.bridges@cps.gov.uk>
Co-authored-by: Renjith Abby <renjithabby@gmail.com>
* filtering status telemetry (#581)

* filtering status telemetry

* fix nuget

* pr comment fixes

* story/FCT2-20672 : Text content update for the unauthorised page (#584)

* task/FCT2-21994 backend test pipeline - rm redundant build job (#585)

* egress delete check all files successful (#586)

* Fct2 21924 bulk delete unknown files (#587)

* deletion of unexisting files

* deletion of existing files

---------

Co-authored-by: Rhys Bridges <rhys.bridges@cps.gov.uk>
Co-authored-by: Renjith Abby <renjithabby@gmail.com>
Co-authored-by: Lilach <Lilach.Davis@cps.gov.uk>
…to main (#594)

- Introduce prSourceBranch and prTargetBranch variables to conditionally run pipeline stages.
- When a PR is opened from development into main:
  - Unit and integration tests are skipped.
  - If there are any changed files within the ui-spa directory, the playwright E2E tests will run against the DEV environment
- When a PR is opened against development OR against main from any source other than development, only the relevant unit and integration tests will run.
@sonarqubecloud

sonarqubecloud Bot commented Sep 25, 2026 •

Copy link
Copy Markdown

@HasanCPS HasanCPS left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM!

@lilachdavis
lilachdavis merged commit ab75b9b into main Sep 25, 2026
12 checks passed
HasanCPS added a commit that referenced this pull request Oct 8, 2026
* subtask/FCT2-22142 Add separate test flow for PRs from development -> main (#597)

* Hotfix/FCT2-22256 use south region vol uuids (#611)

---------

Co-authored-by: Lilach <Lilach.Davis@cps.gov.uk>
HasanCPS added a commit that referenced this pull request Oct 13, 2026
#623)

* subtask/FCT2-22142 Add separate test flow for PRs from development -> main (#597)

* Hotfix/FCT2-22256 use south region vol uuids (#611)

---------

Co-authored-by: Lilach <Lilach.Davis@cps.gov.uk>
HasanCPS added a commit that referenced this pull request Oct 13, 2026
* Task/fct2 22065 revise cicd for new branching strategy (#583)

* filtering status telemetry (#581)

* filtering status telemetry

* fix nuget

* pr comment fixes

* add version to dotnet build

* deploy envs conditionally, require manualvalidation only for prod

* story/FCT2-20672 : Text content update for the unauthorised page (#584)

* add separate pipeline yaml for development trigger

* unblock E2E Tests in Dev

* test release versioning in dev

* test release versioning in dev

* use var instead of parameter for buildConfiguration

* remove temorary test lines

* task/FCT2-21994 backend test pipeline - rm redundant build job (#585)

* egress delete check all files successful (#586)

* Fct2 21924 bulk delete unknown files (#587)

* deletion of unexisting files

* deletion of existing files

* update parameter empty string value option

* trigger integration tests only for debelopment

* rm unused parameters, fix stage dependency

* fix stage dependency

---------

Co-authored-by: Rhys Bridges <rhys.bridges@cps.gov.uk>
Co-authored-by: Renjith Abby <renjithabby@gmail.com>

* Back merge main into development (#592)

* filtering status telemetry (#581)

* filtering status telemetry

* fix nuget

* pr comment fixes

* story/FCT2-20672 : Text content update for the unauthorised page (#584)

* task/FCT2-21994 backend test pipeline - rm redundant build job (#585)

* egress delete check all files successful (#586)

* Fct2 21924 bulk delete unknown files (#587)

* deletion of unexisting files

* deletion of existing files

---------

Co-authored-by: Rhys Bridges <rhys.bridges@cps.gov.uk>
Co-authored-by: Renjith Abby <renjithabby@gmail.com>
Co-authored-by: Lilach <Lilach.Davis@cps.gov.uk>

* subtask/FCT2-22142  Add separate test flow for PRs from development into main (#594)

- Introduce prSourceBranch and prTargetBranch variables to conditionally run pipeline stages.
- When a PR is opened from development into main:
  - Unit and integration tests are skipped.
  - If there are any changed files within the ui-spa directory, the playwright E2E tests will run against the DEV environment
- When a PR is opened against development OR against main from any source other than development, only the relevant unit and integration tests will run.

* netapp to egress small file performance (#598)

* netapp to egress small file performance

* fix integration test

* fixes for prs

* Subtask/fct2 22151 run backend integration tests against staging on pr to main (#596)

* Subtask/fct2 22185 automatically tag merge commits to main (#603)

* Story/FCT2-22005 : added global error boundary and telemetry service (#600)

* added global error boundary and telemetry service

* updated unit tests

* addded ui integration test

* updated the integration tests

* updated the pr based on the review

* pr comment fixes

* FCT2-21686: Remove the V0 transfer-materials screen from the Playwright tests (#605)

* Remove the V0 transfer-materials screen from the Playwright tests

Dev (and every other environment) now renders the V1 "Shared Drive"
transfer screen, so the TRANSFER_MATERIALS_V1 switch and the old-screen
page object are dead weight.

- Delete pages/TransferMaterialsTab.ts (V0 page object and its locators)
- getTransferMaterialsTab always returns TransferMaterialsTabV1
- Drop TRANSFER_MATERIALS_V1 from env-config, .env.template, README and
  the move-playwright, move-soak and e2e job pipelines
- Remove the old-screen branch from both NetApp -> Egress copy specs

* Drop the V0 direction argument from selectAction

The V1 screen has a single Copy/Move control and takes its direction from
the current view (switchToNetAppSource), so the direction argument was
ignored. Remove it from both NetApp -> Egress copy specs and from the
selectAction signature in TransferMaterialsTabApi / TransferMaterialsTabV1
so it can't be passed again.

* Story/FCT2- 21686 legacy code removal (#601)

* removed all the transfer material implementation v0  and tests

* removed  the index style page for old transfer material page

* minor refactor with folder name

* fixed pr comments

* renamed and cleaned up unused codes

* hnadled handleFileTransferClear correctly so that any api erros are handled silently and reported to the telemetry servie

* subtask/FCT2-22185_Automatically-tag-merge-commits-to-main (#606)

* improve performance of netapp to egress (#607)

* consume value of NetAppOptions__RegionName from external variable (#608)

* Add Playwright test for the sanitised global error boundary (FCT2-22112) (#609)

Fails /api/v1/areas (HTTP 500 and network error) after login and checks the GOV.UK error page: heading and body copy, the request's Correlation-Id shown as the error code, no API URL, status or exception text on the page, and the exception reported to POST /api/v1/telemetry.

* small files missing from netapp to egress transfers (#613)

* small files missing from netapp to egress transfers

* pr comment fixes

* Back merge hotfix release-v4.2.1 into development (#614)

* subtask/FCT2-22142 Add separate test flow for PRs from development -> main (#597)

* Hotfix/FCT2-22256 use south region vol uuids (#611)

---------

Co-authored-by: Lilach <Lilach.Davis@cps.gov.uk>

* netapp prefix scoped (#612)

* netapp prefix scoped

* production security group prefix for rcf/

* pr comment fix for canListPrefix

* pr comments

* remove prefix for preprod

* Story/RLCC-100 : Added egress disconnect (#615)

* added egress disconnect

* added the integration test

* upated style and test

* fixed schame validation error andjaavscript error when either egress or shareddrive metadeta is null

* fix lint issue

* fixed pr comments

* npm audit fix (#620)

* RLCC-100:Add Playwright test for disconnecting Egress from a case (#621)

* Add Playwright test for disconnecting Egress from a case (RLCC-100)

Covers the Disconnect menu options, the confirmation page and its validation, No returning to transfer materials, a failed disconnect showing the error page, and Yes disconnecting Egress with the success page and Connect Egress link. Egress is reconnected to the default case after each test.

* Fail fast on missing default-case config and tidy the disconnect route stub

Throw a clear error when DEFAULT_CASE_ID, DEFAULT_CASE_URN, DEFAULT_WORKSPACE_ID or DEFAULT_WORKSPACE_NAME is missing, match the Egress disconnect request with a RegExp, and unroute it at the end of the failure test.

* Merge origin/main into development to resolve release v4.2.2 conflicts (#623)

* subtask/FCT2-22142 Add separate test flow for PRs from development -> main (#597)

* Hotfix/FCT2-22256 use south region vol uuids (#611)

---------

Co-authored-by: Lilach <Lilach.Davis@cps.gov.uk>

* fix: restore entryPrefixes to Production eu-south-1 mappings

---------

Co-authored-by: Lilach <Lilach.Davis@cps.gov.uk>
Co-authored-by: Rhys Bridges <rhys.bridges@cps.gov.uk>
Co-authored-by: Renjith Abby <renjithabby@gmail.com>
Co-authored-by: kmshrajcps <KameshRaj.Rajendran@cps.gov.uk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants