Skip to content
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

[8.x] [Security Solution][Quality Gate Monitoring] Fixed override for monitoring pipeline (#196841) #196861

Merged
merged 1 commit into from
Oct 18, 2024
Merged

[8.x] [Security Solution][Quality Gate Monitoring] Fixed override for monitoring pipeline (#196841) #196861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions ...ck/plugins/security_solution/scripts/run_cypress/project_handler/cloud_project_handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,15 @@ export class CloudHandler extends ProjectHandler {
}

// The qualityGate variable has been added here to ensure that when the quality gate runs, there will be
// no kibana image override. The tests will be executed against the commit which is already promoted to QA.
// no kibana image override unless it is running for the daily monitoring.
// The tests will be executed against the commit which is already promoted to QA.
const monitoringQualityGate =
process.env.KIBANA_MKI_QUALITY_GATE_MONITORING &&
process.env.KIBANA_MKI_QUALITY_GATE_MONITORING === '1';
const qualityGate =
process.env.KIBANA_MKI_QUALITY_GATE && process.env.KIBANA_MKI_QUALITY_GATE === '1';
process.env.KIBANA_MKI_QUALITY_GATE &&
process.env.KIBANA_MKI_QUALITY_GATE === '1' &&
!monitoringQualityGate;
const override = commit && commit !== '' ? commit : process.env.KIBANA_MKI_IMAGE_COMMIT;
if (override && !qualityGate) {
const kibanaOverrideImage = `${override?.substring(0, 12)}`;
Expand Down
10 changes: 8 additions & 2 deletions ...ck/plugins/security_solution/scripts/run_cypress/project_handler/proxy_project_handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,15 @@ export class ProxyHandler extends ProjectHandler {
}

// The qualityGate variable has been added here to ensure that when the quality gate runs, there will be
// no kibana image override. The tests will be executed against the commit which is already promoted to QA.
// no kibana image override unless it is running for the daily monitoring.
// The tests will be executed against the commit which is already promoted to QA.
const monitoringQualityGate =
process.env.KIBANA_MKI_QUALITY_GATE_MONITORING &&
process.env.KIBANA_MKI_QUALITY_GATE_MONITORING === '1';
const qualityGate =
process.env.KIBANA_MKI_QUALITY_GATE && process.env.KIBANA_MKI_QUALITY_GATE === '1';
process.env.KIBANA_MKI_QUALITY_GATE &&
process.env.KIBANA_MKI_QUALITY_GATE === '1' &&
!monitoringQualityGate;
const override = commit && commit !== '' ? commit : process.env.KIBANA_MKI_IMAGE_COMMIT;
if (override && !qualityGate) {
const kibanaOverrideImage = `${override?.substring(0, 12)}`;
Expand Down