Skip to content

Commit 04d585c

Browse files
committed
ci: only check for code coverage
1 parent f0a96a1 commit 04d585c

File tree

2 files changed

+24
-21
lines changed

2 files changed

+24
-21
lines changed

.pipelines/pipeline.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ stages:
256256
vmSize: Standard_B2ms
257257
k8sVersion: ""
258258
dependsOn: "containerize"
259-
260-
259+
260+
261261
# Cilium Nodesubnet E2E tests
262262
- template: singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml
263263
parameters:
@@ -316,7 +316,7 @@ stages:
316316
k8sVersion: ""
317317
dependsOn: "containerize"
318318
scaleup: 100
319-
319+
320320
- template: singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
321321
parameters:
322322
name: "win_azure_overlay_e2e"

.pipelines/templates/run-unit-tests.yaml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ stages:
2525
} 3>&1;
2626
} | { read xs; exit $xs; }
2727
} 4>&1
28-
28+
2929
# combine coverage from multiple modules
3030
(echo "mode: atomic"; tail -q -n +2 coverage-*.out) > coverage.cover
3131
mv coverage.cover linux-coverage.out
@@ -95,20 +95,23 @@ stages:
9595
name: "Coverage"
9696
displayName: "Generate Coverage Report"
9797
condition: always()
98-
- task: PublishCodeCoverageResults@1
99-
displayName: "Publish Code Coverage Report"
100-
condition: always()
101-
inputs:
102-
codeCoverageTool: 'Cobertura'
103-
summaryFileLocation: coverage/linux-coverage.xml
104-
- task: BuildQualityChecks@8
105-
displayName: "Check Code Coverage Regression"
106-
condition: always()
107-
inputs:
108-
checkCoverage: true
109-
coverageFailOption: "build"
110-
coverageType: "lines"
111-
fallbackOnPRTargetBranch: false
112-
baseBranchRef: "master"
113-
allowCoverageVariance: true
114-
coverageVariance: 0.25
98+
# Looking for PRs from merge queue
99+
# Expected output refs/heads/gh-readonly-queue/master/pr-3780-f0a96a1
100+
- ${{ if not(contains(variables['Build.SourceBranch'], 'master/pr')) }}:
101+
- task: PublishCodeCoverageResults@1
102+
displayName: "Publish Code Coverage Report"
103+
condition: always()
104+
inputs:
105+
codeCoverageTool: 'Cobertura'
106+
summaryFileLocation: coverage/linux-coverage.xml
107+
- task: BuildQualityChecks@8
108+
displayName: "Check Code Coverage Regression"
109+
condition: always()
110+
inputs:
111+
checkCoverage: true
112+
coverageFailOption: "build"
113+
coverageType: "lines"
114+
fallbackOnPRTargetBranch: false
115+
baseBranchRef: "master"
116+
allowCoverageVariance: true
117+
coverageVariance: 0.25

0 commit comments

Comments
 (0)