change env variable flow

elastic · Jun 11, 2024 · 5e8f1bc · 5e8f1bc
1 parent 5a6fa91
commit 5e8f1bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.buildkite/pipeline-utils/agent_images.ts b/.buildkite/pipeline-utils/agent_images.ts
@@ -38,8 +38,8 @@ function getAgentImageConfig({ returnYaml = false } = {}): string | AgentImageCo
 
     bk.setAnnotation(
       'agent image config',
-      'warning',
-      '#### FIPS Agents Enabled<br />\nFIPS mode can produce new test failures. If you did not intend this remove ```FTR_ENABLE_FIPS_AGENT``` environment variable and/or the ```ci:enable-fips-agent``` Github label.'
+      'info',
+      '#### FIPS Agents Enabled<br />\nFIPS mode can produce new test failures. If you did not intend this remove ```KBN_ENABLE_FIPS``` environment variable and/or the ```ci:enable-fips-agent``` Github label.'
     );
   } else {
     config = DEFAULT_AGENT_IMAGE_CONFIG;

diff --git a/.buildkite/scripts/common/env.sh b/.buildkite/scripts/common/env.sh
@@ -132,10 +132,10 @@ export TEST_GROUP_TYPE_FUNCTIONAL="Functional Tests"
 # tells the gh command what our default repo is
 export GH_REPO=github.com/elastic/kibana
 
-FIPS_ENABLED=false
+FTR_ENABLE_FIPS_AGENT=false
 # used by FIPS agents to link FIPS OpenSSL modules
-if [[ "${FTR_ENABLE_FIPS_AGENT:-}" == "true" ]] || is_pr_with_label "ci:enable-fips-agent"; then
-  FIPS_ENABLED=true
+if [[ "${KBN_ENABLE_FIPS:-}" == "true" ]] || is_pr_with_label "ci:enable-fips-agent"; then
+  FTR_ENABLE_FIPS_AGENT=true
   export OPENSSL_MODULES=$HOME/openssl/lib/ossl-modules
 
   if [[ -f "$KIBANA_DIR/config/node.options" ]]; then
@@ -144,4 +144,4 @@ if [[ "${FTR_ENABLE_FIPS_AGENT:-}" == "true" ]] || is_pr_with_label "ci:enable-f
   fi
 fi
 
-export FIPS_ENABLED
+export FTR_ENABLE_FIPS_AGENT