elastic · Ikuni17 · Jul 15, 2024 · Jul 4, 2024 · Jul 4, 2024 · Jul 4, 2024
@@ -47,7 +47,6 @@ export MERGE_QUEUE_TARGET_BRANCH
 BUILDKITE_BRANCH_MERGE_QUEUE="${MERGE_QUEUE_TARGET_BRANCH:-${BUILDKITE_BRANCH:-}}"
 export BUILDKITE_BRANCH_MERGE_QUEUE
 
-
 BUILDKITE_AGENT_GCP_REGION=""
 if [[ "$(curl -is metadata.google.internal || true)" ]]; then
   # projects/1003139005402/zones/us-central1-a -> us-central1-a -> us-central1
@@ -133,15 +132,19 @@ export TEST_GROUP_TYPE_FUNCTIONAL="Functional Tests"
 export GH_REPO=github.com/elastic/kibana
 
 FTR_ENABLE_FIPS_AGENT=false
-# used by FIPS agents to link FIPS OpenSSL modules
 if [[ "${KBN_ENABLE_FIPS:-}" == "true" ]] || is_pr_with_label "ci:enable-fips-agent"; then
   FTR_ENABLE_FIPS_AGENT=true
+  # used by FIPS agents to link FIPS OpenSSL modules
   export OPENSSL_MODULES=$HOME/openssl/lib/ossl-modules
 
   if [[ -f "$KIBANA_DIR/config/node.options" ]]; then
     echo -e '\n--enable-fips' >>"$KIBANA_DIR/config/node.options"
     echo "--openssl-config=$HOME/nodejs.cnf" >>"$KIBANA_DIR/config/node.options"
   fi
+
+  if [[ -f "$KIBANA_DIR/config/kibana.yml" ]]; then
+    echo -e '\nxpack.security.experimental.fipsMode.enabled: true' >>"$KIBANA_DIR/config/kibana.yml"
+  fi
 fi
 
 export FTR_ENABLE_FIPS_AGENT
@@ -33,7 +33,7 @@ check_for_changed_files() {
 
   SHOULD_AUTO_COMMIT_CHANGES="${2:-}"
   CUSTOM_FIX_MESSAGE="${3:-}"
-  GIT_CHANGES="$(git status --porcelain -- . ':!:.bazelrc' ':!:config/node.options')"
+  GIT_CHANGES="$(git status --porcelain -- . ':!:.bazelrc' ':!:config/node.options' ':!config/kibana.yml')"
 
   if [ "$GIT_CHANGES" ]; then
     if ! is_auto_commit_disabled && [[ "$SHOULD_AUTO_COMMIT_CHANGES" == "true" && "${BUILDKITE_PULL_REQUEST:-}" ]]; then
@@ -56,7 +56,7 @@ check_for_changed_files() {
       git config --global user.name kibanamachine
       git config --global user.email '[email protected]'
       gh pr checkout "${BUILDKITE_PULL_REQUEST}"
-      git add -A -- . ':!.bazelrc' ':!config/node.options'
+      git add -A -- . ':!.bazelrc' ':!config/node.options' ':!config/kibana.yml'
 
       git commit -m "$NEW_COMMIT_MESSAGE"
       git push

@@ -156,6 +156,7 @@ RUN /usr/bin/echo -e '\n--enable-fips' >> config/node.options
 RUN /usr/bin/echo '--openssl-config=/usr/share/kibana/config/nodejs.cnf' >> config/node.options
 COPY --chown=1000:0 openssl/nodejs.cnf "/usr/share/kibana/config/nodejs.cnf"
 ENV OPENSSL_MODULES=/usr/share/kibana/openssl/lib/ossl-modules
+ENV XPACK_SECURITY_FIPSMODE_ENABLED=true
 
 {{/fips}}
 RUN ln -s /usr/share/kibana /opt/kibana

diff --git a/x-pack/test/alerting_api_integration/observability/config.ts b/x-pack/test/alerting_api_integration/observability/config.ts
@@ -10,7 +10,7 @@ import { createTestConfig } from '../common/config';
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('observability', {
   disabledPlugins: [],
-  license: 'trial',
+  license: 'basic',
   ssl: true,
   enableActionsProxy: true,
   publicBaseUrl: true,

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group1/config.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group1/config.ts
@@ -10,7 +10,7 @@ import { createTestConfig } from '../../common/config';
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('security_and_spaces', {
   disabledPlugins: [],
-  license: 'trial',
+  license: 'basic',
   ssl: true,
   enableActionsProxy: true,
   publicBaseUrl: true,

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts
@@ -10,7 +10,7 @@ import { createTestConfig } from '../../common/config';
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('security_and_spaces', {
   disabledPlugins: [],
-  license: 'trial',
+  license: 'basic',
   ssl: true,
   enableActionsProxy: true,
   publicBaseUrl: true,

diff --git a/...t/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts b/...t/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts
@@ -10,7 +10,7 @@ import { createTestConfig } from '../../common/config';
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('security_and_spaces', {
   disabledPlugins: [],
-  license: 'trial',
+  license: 'basic',
   ssl: true,
   enableActionsProxy: true,
   publicBaseUrl: true,

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/config.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/config.ts
@@ -10,7 +10,7 @@ import { createTestConfig } from '../../../../common/config';
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('security_and_spaces', {
   disabledPlugins: [],
-  license: 'trial',
+  license: 'basic',
   ssl: true,
   enableActionsProxy: true,
   publicBaseUrl: true,

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/telemetry/config.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/telemetry/config.ts
@@ -10,7 +10,7 @@ import { createTestConfig } from '../../../../common/config';
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('security_and_spaces', {
   disabledPlugins: [],
-  license: 'trial',
+  license: 'basic',
   ssl: true,
   enableActionsProxy: true,
   publicBaseUrl: true,

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group3/config.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group3/config.ts
@@ -10,7 +10,7 @@ import { createTestConfig } from '../../common/config';
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('security_and_spaces', {
   disabledPlugins: [],
-  license: 'trial',
+  license: 'basic',
   ssl: true,
   enableActionsProxy: true,
   publicBaseUrl: true,

diff --git a/...erting_api_integration/security_and_spaces/group3/config_with_schedule_circuit_breaker.ts b/...erting_api_integration/security_and_spaces/group3/config_with_schedule_circuit_breaker.ts
@@ -10,7 +10,7 @@ import { createTestConfig } from '../../common/config';
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('security_and_spaces', {
   disabledPlugins: [],
-  license: 'trial',
+  license: 'basic',
   ssl: true,
   enableActionsProxy: true,
   publicBaseUrl: true,

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group4/config.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group4/config.ts
@@ -10,7 +10,7 @@ import { createTestConfig } from '../../common/config';
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('security_and_spaces', {
   disabledPlugins: [],
-  license: 'trial',
+  license: 'basic',
   ssl: true,
   enableActionsProxy: true,
   publicBaseUrl: true,

diff --git a/...t/alerting_api_integration/security_and_spaces/group4/config_non_dedicated_task_runner.ts b/...t/alerting_api_integration/security_and_spaces/group4/config_non_dedicated_task_runner.ts
@@ -10,7 +10,7 @@ import { createTestConfig } from '../../common/config';
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('security_and_spaces', {
   disabledPlugins: [],
-  license: 'trial',
+  license: 'basic',
   ssl: true,
   enableActionsProxy: true,
   publicBaseUrl: true,

diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts
@@ -12,7 +12,7 @@ export const EmailDomainsAllowed = ['example.org', 'test.com'];
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('spaces_only', {
   disabledPlugins: ['security'],
-  license: 'trial',
+  license: 'basic',
   enableActionsProxy: false,
   verificationMode: 'none',
   customizeLocalHostSsl: true,

diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/config.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/config.ts
@@ -12,7 +12,7 @@ export const EmailDomainsAllowed = ['example.org', 'test.com'];
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('spaces_only', {
   disabledPlugins: ['security'],
-  license: 'trial',
+  license: 'basic',
   enableActionsProxy: false,
   verificationMode: 'none',
   customizeLocalHostSsl: true,

diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/config.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/config.ts
@@ -12,7 +12,7 @@ export const EmailDomainsAllowed = ['example.org', 'test.com'];
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('spaces_only', {
   disabledPlugins: ['security'],
-  license: 'trial',
+  license: 'basic',
   enableActionsProxy: false,
   verificationMode: 'none',
   customizeLocalHostSsl: true,

diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/config.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/config.ts
@@ -12,7 +12,7 @@ export const EmailDomainsAllowed = ['example.org', 'test.com'];
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('spaces_only', {
   disabledPlugins: ['security'],
-  license: 'trial',
+  license: 'basic',
   enableActionsProxy: false,
   verificationMode: 'none',
   customizeLocalHostSsl: true,

diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/config.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/config.ts
@@ -12,7 +12,7 @@ export const EmailDomainsAllowed = ['example.org', 'test.com'];
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('spaces_only', {
   disabledPlugins: ['security'],
-  license: 'trial',
+  license: 'basic',
   enableActionsProxy: false,
   verificationMode: 'none',
   customizeLocalHostSsl: true,

diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/config.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/config.ts
@@ -12,7 +12,7 @@ export const EmailDomainsAllowed = ['example.org', 'test.com'];
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('spaces_only', {
   disabledPlugins: ['security'],
-  license: 'trial',
+  license: 'basic',
   enableActionsProxy: false,
   verificationMode: 'none',
   customizeLocalHostSsl: true,

diff --git a/x-pack/test/alerting_api_integration/spaces_only_legacy/config.ts b/x-pack/test/alerting_api_integration/spaces_only_legacy/config.ts
@@ -10,7 +10,7 @@ import { createTestConfig } from '../common/config';
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('spaces_only', {
   disabledPlugins: ['security'],
-  license: 'trial',
+  license: 'basic',
   enableActionsProxy: false,
   rejectUnauthorized: false,
   verificationMode: undefined,

diff --git a/x-pack/test/apm_api_integration/configs/index.ts b/x-pack/test/apm_api_integration/configs/index.ts
@@ -26,11 +26,11 @@ const apmFtrConfigs = {
     kibanaConfig,
   },
   trial: {
-    license: 'trial' as const,
+    license: 'basic' as const,
     kibanaConfig,
   },
   rules: {
-    license: 'trial' as const,
+    license: 'basic' as const,
     kibanaConfig: {
       ...kibanaConfig,
       'xpack.ruleRegistry.write.enabled': 'true',

diff --git a/x-pack/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts b/x-pack/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts
@@ -9,7 +9,7 @@ import { createTestConfig } from '../common/config';
 
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('security_and_spaces', {
-  license: 'trial',
+  license: 'basic',
   ssl: true,
   testFiles: [require.resolve('./tests/no_public_base_url')],
   publicBaseUrl: false,

diff --git a/x-pack/test/cases_api_integration/security_and_spaces/config_trial.ts b/x-pack/test/cases_api_integration/security_and_spaces/config_trial.ts
@@ -9,7 +9,7 @@ import { createTestConfig } from '../common/config';
 
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('security_and_spaces', {
-  license: 'trial',
+  license: 'basic',
   ssl: true,
   testFiles: [require.resolve('./tests/trial')],
   publicBaseUrl: true,

diff --git a/x-pack/test/cases_api_integration/spaces_only/config.ts b/x-pack/test/cases_api_integration/spaces_only/config.ts
@@ -10,7 +10,7 @@ import { createTestConfig } from '../common/config';
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('spaces_only', {
   disabledPlugins: ['security'],
-  license: 'trial',
+  license: 'basic',
   ssl: false,
   testFiles: [require.resolve('./tests/trial')],
 });
diff --git a/x-pack/test/cloud_integration/config.ts b/x-pack/test/cloud_integration/config.ts
@@ -46,7 +46,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     servers: kibanaFunctionalConfig.get('servers'),
 
     esTestCluster: {
-      license: 'trial',
+      license: 'basic',
       from: 'snapshot',
       serverArgs: [
         'xpack.security.authc.token.enabled=true',

diff --git a/x-pack/test/custom_branding/config.ts b/x-pack/test/custom_branding/config.ts
@@ -27,7 +27,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
 
     esTestCluster: {
       ...kibanaFunctionalConfig.get('esTestCluster'),
-      license: 'trial',
+      license: 'basic',
       serverArgs: [`xpack.license.self_generated.type='trial'`],
     },
     apps: {

diff --git a/x-pack/test/ftr_apis/security_and_spaces/config.ts b/x-pack/test/ftr_apis/security_and_spaces/config.ts
@@ -23,7 +23,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     },
     esTestCluster: {
       ...apiIntegrationConfig.get('esTestCluster'),
-      license: 'trial',
+      license: 'basic',
     },
     kbnTestServer: {
       ...apiIntegrationConfig.get('kbnTestServer'),

diff --git a/x-pack/test/functional/config.base.js b/x-pack/test/functional/config.base.js
@@ -33,7 +33,7 @@ export default async function ({ readConfigFile }) {
     servers: kibanaFunctionalConfig.get('servers'),
 
     esTestCluster: {
-      license: 'trial',
+      license: 'basic',
       from: 'snapshot',
       serverArgs: ['path.repo=/tmp/', 'xpack.security.authc.api_key.enabled=true'],
     },

diff --git a/x-pack/test/observability_ai_assistant_api_integration/configs/index.ts b/x-pack/test/observability_ai_assistant_api_integration/configs/index.ts
@@ -23,7 +23,7 @@ export const observabilityAIAssistantFtrConfigs = {
     },
   },
   enterprise: {
-    license: 'trial' as const,
+    license: 'basic' as const,
     kibanaConfig: {
       'logging.loggers': [observabilityAIAssistantDebugLogger],
       'plugin-path': path.resolve(

diff --git a/x-pack/test/observability_api_integration/trial/config.ts b/x-pack/test/observability_api_integration/trial/config.ts
@@ -9,7 +9,7 @@ import { createTestConfig } from '../common/config';
 
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig({
-  license: 'trial',
+  license: 'basic',
   name: 'X-Pack Observability API integration tests (trial)',
   testFiles: [require.resolve('./tests')],
 });
diff --git a/x-pack/test/profiling_api_integration/configs/index.ts b/x-pack/test/profiling_api_integration/configs/index.ts
@@ -19,7 +19,7 @@ const profilingDebugLogger = {
 
 const profilingFtrConfigs = {
   cloud: {
-    license: 'trial' as const,
+    license: 'basic' as const,
     kibanaConfig: {
       'logging.loggers': [profilingDebugLogger],
       config: kibanaYamlFilePath,

diff --git a/x-pack/test/rule_registry/security_and_spaces/config_trial.ts b/x-pack/test/rule_registry/security_and_spaces/config_trial.ts
@@ -9,7 +9,7 @@ import { createTestConfig } from '../common/config';
 
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('security_and_spaces', {
-  license: 'trial',
+  license: 'basic',
   ssl: true,
   testFiles: [require.resolve('./tests/trial')],
 });
diff --git a/x-pack/test/rule_registry/spaces_only/config_trial.ts b/x-pack/test/rule_registry/spaces_only/config_trial.ts
@@ -9,7 +9,7 @@ import { createTestConfig } from '../common/config';
 
 // eslint-disable-next-line import/no-default-export
 export default createTestConfig('spaces_only', {
-  license: 'trial',
+  license: 'basic',
   disabledPlugins: ['security'],
   ssl: false,
   testFiles: [require.resolve('./tests/trial')],

diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/config_trial.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/config_trial.ts
@@ -8,4 +8,4 @@
 import { createTestConfig } from '../common/config';
 
 // eslint-disable-next-line import/no-default-export
-export default createTestConfig('security_and_spaces', { license: 'trial' });
+export default createTestConfig('security_and_spaces', { license: 'basic' });
diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts
@@ -24,7 +24,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     },
     esTestCluster: {
       ...apiIntegrationConfig.get('esTestCluster'),
-      license: 'trial',
+      license: 'basic',
     },
     kbnTestServer: {
       ...apiIntegrationConfig.get('kbnTestServer'),

diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts
@@ -23,7 +23,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     },
     esTestCluster: {
       ...apiIntegrationConfig.get('esTestCluster'),
-      license: 'trial',
+      license: 'basic',
     },
     kbnTestServer: {
       ...apiIntegrationConfig.get('kbnTestServer'),

diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts
@@ -23,7 +23,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     },
     esTestCluster: {
       ...apiIntegrationConfig.get('esTestCluster'),
-      license: 'trial',
+      license: 'basic',
     },
     kbnTestServer: {
       ...apiIntegrationConfig.get('kbnTestServer'),

diff --git a/x-pack/test/saved_objects_field_count/config.ts b/x-pack/test/saved_objects_field_count/config.ts
@@ -18,7 +18,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     testFiles: [require.resolve('./test')],
 
     esTestCluster: {
-      license: 'trial',
+      license: 'basic',
       from: 'snapshot',
       serverArgs: ['path.repo=/tmp/'],
     },

diff --git a/x-pack/test/security_functional/insecure_cluster_warning.config.ts b/x-pack/test/security_functional/insecure_cluster_warning.config.ts
@@ -33,7 +33,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     servers: kibanaFunctionalConfig.get('servers'),
 
     esTestCluster: {
-      license: 'trial',
+      license: 'basic',
       from: 'snapshot',
       serverArgs: ['xpack.security.enabled=false'],
     },

diff --git a/x-pack/test/security_functional/login_selector.config.ts b/x-pack/test/security_functional/login_selector.config.ts
@@ -41,7 +41,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     servers: kibanaFunctionalConfig.get('servers'),
 
     esTestCluster: {
-      license: 'trial',
+      license: 'basic',
       from: 'snapshot',
       serverArgs: [
         'xpack.security.authc.token.enabled=true',

diff --git a/x-pack/test/security_functional/oidc.config.ts b/x-pack/test/security_functional/oidc.config.ts
@@ -35,7 +35,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     servers: kibanaFunctionalConfig.get('servers'),
 
     esTestCluster: {
-      license: 'trial',
+      license: 'basic',
       from: 'snapshot',
       serverArgs: [
         'xpack.security.authc.token.enabled=true',