Skip to content

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

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
lilachdavis merged 5 commits into from
Sep 25, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20d6cd7
Task/fct2 22065 revise cicd for new branching strategy (#583)
lilachdavis Sep 23, 2026
f86801e
Back merge main into development (#592)
HasanCPS Sep 23, 2026
a292ed8
Merge origin/main into development
HasanCPS Sep 23, 2026
6d96f96
Merge origin/main into development
HasanCPS Sep 23, 2026
97756fb
subtask/FCT2-22142 Add separate test flow for PRs from development i…
lilachdavis Sep 25, 2026
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
8 changes: 8 additions & 0 deletions devops-pipelines/backend/backend-pr-build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,19 @@ variables:
value: '10.0.*'
- name: testResultsDirectory
value: "$(Agent.TempDirectory)/TestResults"
- name: prSourceBranch
value: $[variables['System.PullRequest.SourceBranch']]
- name: prTargetBranch
value: $[variables['System.PullRequest.TargetBranch']]

pool: "LACC PreProd Pool"

stages:
- stage: Build_And_Test_Backend
condition: not(and(
eq(variables.prSourceBranch, 'development' ),
eq(variables.prTargetBranch, 'main')
))
displayName: "Build, Test & Package"
jobs:
- job: Package_NuGet
Expand Down
21 changes: 21 additions & 0 deletions devops-pipelines/ui/ui-pr-build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,17 @@ variables:
value: ui-spa
- name: covDir
value: "coverage"
- name: prSourceBranch
value: $[variables['System.PullRequest.SourceBranch']]
- name: prTargetBranch
value: $[variables['System.PullRequest.TargetBranch']]

stages:
- stage: Build_and_Test_UI
condition: not(and(
eq(variables.prSourceBranch, 'development' ),
eq(variables.prTargetBranch, 'main')
))
displayName: "Build & Test UI SPA"
jobs:
- job: Build_and_Test
Expand Down Expand Up @@ -143,3 +151,16 @@ stages:
inputs:
summaryFileLocation: "$(workingDir)/$(covDir)/merged/Cobertura.xml"
failIfCoverageEmpty: true

# On PR development -> main, run the E2E tests in dev
- stage: Run_E2E_tests
condition: and(
eq(variables.prSourceBranch, 'development' ),
eq(variables.prTargetBranch, 'main' )
)
dependsOn: []
displayName: "Run E2E Test on Dev"
jobs:
- template: ../templates/e2e-playwright-test-job.yml
parameters:
environment: "dev"
Loading