test

elastic · Aug 8, 2023 · a7c947d · a7c947d
1 parent faabe57
commit a7c947d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.buildkite/scripts/steps/functional/security_solution_burn.sh b/.buildkite/scripts/steps/functional/security_solution_burn.sh
@@ -8,6 +8,8 @@ source .buildkite/scripts/steps/functional/common_cypress.sh
 export JOB=kibana-security-solution-chrome
 export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
 
+buildkite-agent meta-data set "${BUILDKITE_JOB_ID}_is_test_execution_step" 'false'
+
 echo "--- Security Solution Cypress tests, burning changed specs (Chrome)"
 
 yarn --cwd x-pack/plugins/security_solution cypress:changed-specs-only
diff --git a/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts b/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts
@@ -388,7 +388,6 @@ ${JSON.stringify(config.getAll(), null, 2)}
             // Normalized the set of available env vars in cypress
             const cyCustomEnv = {
               ...ftrEnv,
-              ...argv.env,
 
               // NOTE:
               // ELASTICSEARCH_URL needs to be created here with auth because SIEM cypress setup depends on it. At some
@@ -407,6 +406,8 @@ ${JSON.stringify(config.getAll(), null, 2)}
               KIBANA_URL_WITH_AUTH: createUrlFromFtrConfig('kibana', true),
               KIBANA_USERNAME: config.get('servers.kibana.username'),
               KIBANA_PASSWORD: config.get('servers.kibana.password'),
+
+              ...argv.env,
             };
 
             log.info(`