Merge branch 'main' into task/olm-8538-endpoint-list-api-support-spac…

…es-2
elastic · Oct 16, 2024 · 081389b · 081389b
2 parents b9b7f54 + cbe5d9a
commit 081389b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ck/plugins/security_solution/scripts/run_cypress/project_handler/cloud_project_handler.ts b/...ck/plugins/security_solution/scripts/run_cypress/project_handler/cloud_project_handler.ts
@@ -44,7 +44,7 @@ export class CloudHandler extends ProjectHandler {
     // no kibana image override. The tests will be executed against the commit which is already promoted to QA.
     const qualityGate =
       process.env.KIBANA_MKI_QUALITY_GATE && process.env.KIBANA_MKI_QUALITY_GATE === '1';
-    const override = commit ?? process.env.KIBANA_MKI_IMAGE_COMMIT;
+    const override = commit && commit !== '' ? commit : process.env.KIBANA_MKI_IMAGE_COMMIT;
     if (override && !qualityGate) {
       const kibanaOverrideImage = `${override?.substring(0, 12)}`;
       this.log.info(`Kibana Image Commit under test: ${process.env.KIBANA_MKI_IMAGE_COMMIT}!`);

diff --git a/...ck/plugins/security_solution/scripts/run_cypress/project_handler/proxy_project_handler.ts b/...ck/plugins/security_solution/scripts/run_cypress/project_handler/proxy_project_handler.ts
@@ -44,7 +44,7 @@ export class ProxyHandler extends ProjectHandler {
     // no kibana image override. The tests will be executed against the commit which is already promoted to QA.
     const qualityGate =
       process.env.KIBANA_MKI_QUALITY_GATE && process.env.KIBANA_MKI_QUALITY_GATE === '1';
-    const override = commit ?? process.env.KIBANA_MKI_IMAGE_COMMIT;
+    const override = commit && commit !== '' ? commit : process.env.KIBANA_MKI_IMAGE_COMMIT;
     if (override && !qualityGate) {
       const kibanaOverrideImage = `${override?.substring(0, 12)}`;
       this.log.info(`Kibana Image Commit under test: ${process.env.KIBANA_MKI_IMAGE_COMMIT}!`);