[FTR] Add serverless ES project controller settings

elastic · Sep 26, 2023 · 27e1450 · 27e1450
1 parent 329e845
commit 27e1450
Show file tree

Hide file tree

Showing 19 changed files with 79 additions and 0 deletions.
diff --git a/x-pack/test_serverless/api_integration/config.base.ts b/x-pack/test_serverless/api_integration/config.base.ts
@@ -20,6 +20,13 @@ export function createTestConfig(options: CreateTestConfigOptions) {
         ...services,
         ...options.services,
       },
+      esTestCluster: {
+        ...svlSharedConfig.get('esTestCluster'),
+        serverArgs: [
+          ...svlSharedConfig.get('esTestCluster.serverArgs'),
+          ...(options.esServerArgs ?? []),
+        ],
+      },
       kbnTestServer: {
         ...svlSharedConfig.get('kbnTestServer'),
         serverArgs: [

diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/config.feature_flags.ts b/x-pack/test_serverless/api_integration/test_suites/observability/config.feature_flags.ts
@@ -23,4 +23,8 @@ export default createTestConfig({
   kbnServerArgs: ['--xpack.observability.unsafe.thresholdRule.enabled=true'],
   // load tests in the index file
   testFiles: [require.resolve('./index.feature_flags.ts')],
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/blob/main/internal/project/observability/config/elasticsearch.yml
+  esServerArgs: ['xpack.ml.dfa.enabled=false', 'xpack.ml.nlp.enabled=false'],
 });
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/config.ts b/x-pack/test_serverless/api_integration/test_suites/observability/config.ts
@@ -16,4 +16,8 @@ export default createTestConfig({
   },
   suiteTags: { exclude: ['skipSvlOblt'] },
   services,
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/blob/main/internal/project/observability/config/elasticsearch.yml
+  esServerArgs: ['xpack.ml.dfa.enabled=false', 'xpack.ml.nlp.enabled=false'],
 });
diff --git a/x-pack/test_serverless/api_integration/test_suites/search/config.feature_flags.ts b/x-pack/test_serverless/api_integration/test_suites/search/config.feature_flags.ts
@@ -21,4 +21,8 @@ export default createTestConfig({
   kbnServerArgs: [],
   // load tests in the index file
   testFiles: [require.resolve('./index.feature_flags.ts')],
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/tree/main/internal/project/esproject/config
+  esServerArgs: ['xpack.ml.ad.enabled=false', 'xpack.ml.dfa.enabled=false'],
 });
diff --git a/x-pack/test_serverless/api_integration/test_suites/search/config.ts b/x-pack/test_serverless/api_integration/test_suites/search/config.ts
@@ -14,4 +14,8 @@ export default createTestConfig({
     reportName: 'Serverless Search API Integration Tests',
   },
   suiteTags: { exclude: ['skipSvlSearch'] },
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/tree/main/internal/project/esproject/config
+  esServerArgs: ['xpack.ml.ad.enabled=false', 'xpack.ml.dfa.enabled=false'],
 });
diff --git a/x-pack/test_serverless/api_integration/test_suites/security/config.feature_flags.ts b/x-pack/test_serverless/api_integration/test_suites/security/config.feature_flags.ts
@@ -21,4 +21,8 @@ export default createTestConfig({
   kbnServerArgs: [],
   // load tests in the index file
   testFiles: [require.resolve('./index.feature_flags.ts')],
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/blob/main/internal/project/security/config/elasticsearch.yml
+  esServerArgs: ['xpack.ml.nlp.enabled=false'],
 });
diff --git a/x-pack/test_serverless/api_integration/test_suites/security/config.ts b/x-pack/test_serverless/api_integration/test_suites/security/config.ts
@@ -14,4 +14,8 @@ export default createTestConfig({
     reportName: 'Serverless Security API Integration Tests',
   },
   suiteTags: { exclude: ['skipSvlSec'] },
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/blob/main/internal/project/security/config/elasticsearch.yml
+  esServerArgs: ['xpack.ml.nlp.enabled=false'],
 });
diff --git a/x-pack/test_serverless/functional/config.base.ts b/x-pack/test_serverless/functional/config.base.ts
@@ -22,6 +22,13 @@ export function createTestConfig(options: CreateTestConfigOptions) {
 
       pageObjects,
       services,
+      esTestCluster: {
+        ...svlSharedConfig.get('esTestCluster'),
+        serverArgs: [
+          ...svlSharedConfig.get('esTestCluster.serverArgs'),
+          ...(options.esServerArgs ?? []),
+        ],
+      },
       kbnTestServer: {
         ...svlSharedConfig.get('kbnTestServer'),
         serverArgs: [

diff --git a/x-pack/test_serverless/functional/test_suites/observability/config.examples.ts b/x-pack/test_serverless/functional/test_suites/observability/config.examples.ts
@@ -20,4 +20,8 @@ export default createTestConfig({
     resolve(REPO_ROOT, 'examples'),
     resolve(REPO_ROOT, 'x-pack/examples'),
   ]),
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/blob/main/internal/project/observability/config/elasticsearch.yml
+  esServerArgs: ['xpack.ml.dfa.enabled=false', 'xpack.ml.nlp.enabled=false'],
 });
diff --git a/x-pack/test_serverless/functional/test_suites/observability/config.feature_flags.ts b/x-pack/test_serverless/functional/test_suites/observability/config.feature_flags.ts
@@ -21,4 +21,8 @@ export default createTestConfig({
   kbnServerArgs: [],
   // load tests in the index file
   testFiles: [require.resolve('./index.feature_flags.ts')],
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/blob/main/internal/project/observability/config/elasticsearch.yml
+  esServerArgs: ['xpack.ml.dfa.enabled=false', 'xpack.ml.nlp.enabled=false'],
 });
diff --git a/x-pack/test_serverless/functional/test_suites/observability/config.ts b/x-pack/test_serverless/functional/test_suites/observability/config.ts
@@ -14,4 +14,8 @@ export default createTestConfig({
     reportName: 'Serverless Observability Functional Tests',
   },
   suiteTags: { exclude: ['skipSvlOblt'] },
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/blob/main/internal/project/observability/config/elasticsearch.yml
+  esServerArgs: ['xpack.ml.dfa.enabled=false', 'xpack.ml.nlp.enabled=false'],
 });
diff --git a/x-pack/test_serverless/functional/test_suites/search/config.examples.ts b/x-pack/test_serverless/functional/test_suites/search/config.examples.ts
@@ -20,4 +20,8 @@ export default createTestConfig({
     resolve(REPO_ROOT, 'examples'),
     resolve(REPO_ROOT, 'x-pack/examples'),
   ]),
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/tree/main/internal/project/esproject/config
+  esServerArgs: ['xpack.ml.ad.enabled=false', 'xpack.ml.dfa.enabled=false'],
 });
diff --git a/x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts b/x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts
@@ -21,4 +21,8 @@ export default createTestConfig({
   kbnServerArgs: [],
   // load tests in the index file
   testFiles: [require.resolve('./index.feature_flags.ts')],
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/tree/main/internal/project/esproject/config
+  esServerArgs: ['xpack.ml.ad.enabled=false', 'xpack.ml.dfa.enabled=false'],
 });
diff --git a/x-pack/test_serverless/functional/test_suites/search/config.screenshots.ts b/x-pack/test_serverless/functional/test_suites/search/config.screenshots.ts
@@ -16,4 +16,8 @@ export default createTestConfig({
   junit: {
     reportName: 'Serverless Search Screenshot Creation',
   },
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/tree/main/internal/project/esproject/config
+  esServerArgs: ['xpack.ml.ad.enabled=false', 'xpack.ml.dfa.enabled=false'],
 });
diff --git a/x-pack/test_serverless/functional/test_suites/search/config.ts b/x-pack/test_serverless/functional/test_suites/search/config.ts
@@ -14,4 +14,8 @@ export default createTestConfig({
     reportName: 'Serverless Search Functional Tests',
   },
   suiteTags: { exclude: ['skipSvlSearch'] },
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/tree/main/internal/project/esproject/config
+  esServerArgs: ['xpack.ml.ad.enabled=false', 'xpack.ml.dfa.enabled=false'],
 });
diff --git a/x-pack/test_serverless/functional/test_suites/security/config.examples.ts b/x-pack/test_serverless/functional/test_suites/security/config.examples.ts
@@ -20,4 +20,8 @@ export default createTestConfig({
     resolve(REPO_ROOT, 'examples'),
     resolve(REPO_ROOT, 'x-pack/examples'),
   ]),
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/blob/main/internal/project/security/config/elasticsearch.yml
+  esServerArgs: ['xpack.ml.nlp.enabled=false'],
 });
diff --git a/x-pack/test_serverless/functional/test_suites/security/config.feature_flags.ts b/x-pack/test_serverless/functional/test_suites/security/config.feature_flags.ts
@@ -21,4 +21,8 @@ export default createTestConfig({
   kbnServerArgs: [],
   // load tests in the index file
   testFiles: [require.resolve('./index.feature_flags.ts')],
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/blob/main/internal/project/security/config/elasticsearch.yml
+  esServerArgs: ['xpack.ml.nlp.enabled=false'],
 });
diff --git a/x-pack/test_serverless/functional/test_suites/security/config.ts b/x-pack/test_serverless/functional/test_suites/security/config.ts
@@ -14,4 +14,8 @@ export default createTestConfig({
     reportName: 'Serverless Security Functional Tests',
   },
   suiteTags: { exclude: ['skipSvlSec'] },
+
+  // include settings from project controller
+  // https://github.com/elastic/project-controller/blob/main/internal/project/security/config/elasticsearch.yml
+  esServerArgs: ['xpack.ml.nlp.enabled=false'],
 });
diff --git a/x-pack/test_serverless/shared/types/index.ts b/x-pack/test_serverless/shared/types/index.ts
@@ -9,6 +9,7 @@ import { InheritedServices } from '../../api_integration/services';
 
 export interface CreateTestConfigOptions {
   serverlessProject: 'es' | 'oblt' | 'security';
+  esServerArgs?: string[];
   kbnServerArgs?: string[];
   testFiles: string[];
   junit: { reportName: string };