Revert "move everything out of ciGroup2 for flaky test runner"

pgayvallet · pgayvallet · commit 5e9a93c4d65c · 2020-11-16T14:41:21.000+01:00
This reverts commit db86c3b
diff --git a/x-pack/test/api_integration_basic/apis/index.ts b/x-pack/test/api_integration_basic/apis/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('apis', function () {
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
 
     loadTestFile(require.resolve('./ml'));
     loadTestFile(require.resolve('./transform'));
diff --git a/x-pack/test/case_api_integration/basic/tests/index.ts b/x-pack/test/case_api_integration/basic/tests/index.ts
@@ -10,7 +10,7 @@ import { FtrProviderContext } from '../../common/ftr_provider_context';
 export default ({ loadTestFile }: FtrProviderContext): void => {
   describe('case api basic', function () {
     // Fastest ciGroup for the moment.
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
 
     loadTestFile(require.resolve('./cases/comments/delete_comment'));
     loadTestFile(require.resolve('./cases/comments/find_comments'));
diff --git a/x-pack/test/encrypted_saved_objects_api_integration/tests/index.ts b/x-pack/test/encrypted_saved_objects_api_integration/tests/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('encryptedSavedObjects', function encryptedSavedObjectsSuite() {
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
     loadTestFile(require.resolve('./encrypted_saved_objects_api'));
   });
 }
diff --git a/x-pack/test/functional/apps/advanced_settings/index.ts b/x-pack/test/functional/apps/advanced_settings/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function advancedSettingsApp({ loadTestFile }: FtrProviderContext) {
   describe('Advanced Settings', function canvasAppTestSuite() {
-    this.tags(['ciGroup1', 'skipFirefox']); // CI requires tags ヽ(゜Q。)ノ？
+    this.tags(['ciGroup2', 'skipFirefox']); // CI requires tags ヽ(゜Q。)ノ？
     loadTestFile(require.resolve('./feature_controls/advanced_settings_security'));
     loadTestFile(require.resolve('./feature_controls/advanced_settings_spaces'));
   });
diff --git a/x-pack/test/functional/apps/api_keys/feature_controls/index.ts b/x-pack/test/functional/apps/api_keys/feature_controls/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function () {
-    this.tags(['ciGroup1']);
+    this.tags(['ciGroup2']);
 
     loadTestFile(require.resolve('./api_keys_security'));
   });
diff --git a/x-pack/test/functional/apps/canvas/index.js b/x-pack/test/functional/apps/canvas/index.js
@@ -19,7 +19,7 @@ export default function canvasApp({ loadTestFile, getService }) {
       await security.testUser.restoreDefaults();
     });
 
-    this.tags('ciGroup1'); // CI requires tags ヽ(゜Q。)ノ？
+    this.tags('ciGroup2'); // CI requires tags ヽ(゜Q。)ノ？
     loadTestFile(require.resolve('./smoke_test'));
     loadTestFile(require.resolve('./expression'));
     loadTestFile(require.resolve('./filters'));
diff --git a/x-pack/test/functional/apps/cross_cluster_replication/feature_controls/index.ts b/x-pack/test/functional/apps/cross_cluster_replication/feature_controls/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function () {
-    this.tags(['ciGroup1']);
+    this.tags(['ciGroup2']);
 
     loadTestFile(require.resolve('./ccr_security'));
   });
diff --git a/x-pack/test/functional/apps/grok_debugger/index.js b/x-pack/test/functional/apps/grok_debugger/index.js
@@ -6,7 +6,7 @@
 
 export default function ({ loadTestFile }) {
   describe('logstash', function () {
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
 
     loadTestFile(require.resolve('./grok_debugger'));
   });
diff --git a/x-pack/test/functional/apps/index_lifecycle_management/feature_controls/index.ts b/x-pack/test/functional/apps/index_lifecycle_management/feature_controls/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function () {
-    this.tags(['ciGroup1']);
+    this.tags(['ciGroup2']);
 
     loadTestFile(require.resolve('./ilm_security'));
   });
diff --git a/x-pack/test/functional/apps/index_management/feature_controls/index.ts b/x-pack/test/functional/apps/index_management/feature_controls/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function () {
-    this.tags(['ciGroup1']);
+    this.tags(['ciGroup2']);
 
     loadTestFile(require.resolve('./index_management_security'));
   });
diff --git a/x-pack/test/functional/apps/index_patterns/index.ts b/x-pack/test/functional/apps/index_patterns/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function advancedSettingsApp({ loadTestFile }: FtrProviderContext) {
   describe('Index Patterns', function indexPatternsTestSuite() {
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
     loadTestFile(require.resolve('./feature_controls'));
   });
 }
diff --git a/x-pack/test/functional/apps/ingest_pipelines/feature_controls/index.ts b/x-pack/test/functional/apps/ingest_pipelines/feature_controls/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function () {
-    this.tags(['ciGroup1']);
+    this.tags(['ciGroup2']);
 
     loadTestFile(require.resolve('./ingest_pipelines_security'));
   });
diff --git a/x-pack/test/functional/apps/license_management/feature_controls/index.ts b/x-pack/test/functional/apps/license_management/feature_controls/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function () {
-    this.tags(['ciGroup1']);
+    this.tags(['ciGroup2']);
 
     loadTestFile(require.resolve('./license_management_security'));
   });
diff --git a/x-pack/test/functional/apps/logstash/feature_controls/index.ts b/x-pack/test/functional/apps/logstash/feature_controls/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function () {
-    this.tags(['ciGroup1']);
+    this.tags(['ciGroup2']);
 
     loadTestFile(require.resolve('./logstash_security'));
   });
diff --git a/x-pack/test/functional/apps/logstash/index.js b/x-pack/test/functional/apps/logstash/index.js
@@ -6,7 +6,7 @@
 
 export default function ({ loadTestFile }) {
   describe('logstash', function () {
-    this.tags(['ciGroup1']);
+    this.tags(['ciGroup2']);
 
     loadTestFile(require.resolve('./feature_controls'));
     loadTestFile(require.resolve('./pipeline_list'));
diff --git a/x-pack/test/functional/apps/management/feature_controls/index.ts b/x-pack/test/functional/apps/management/feature_controls/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function () {
-    this.tags(['ciGroup1']);
+    this.tags(['ciGroup2']);
 
     loadTestFile(require.resolve('./management_security'));
   });
diff --git a/x-pack/test/functional/apps/management/index.ts b/x-pack/test/functional/apps/management/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('management', function () {
-    this.tags(['ciGroup1']);
+    this.tags(['ciGroup2']);
 
     loadTestFile(require.resolve('./create_index_pattern_wizard'));
     loadTestFile(require.resolve('./feature_controls'));
diff --git a/x-pack/test/functional/apps/remote_clusters/feature_controls/index.ts b/x-pack/test/functional/apps/remote_clusters/feature_controls/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function () {
-    this.tags(['ciGroup1']);
+    this.tags(['ciGroup2']);
 
     loadTestFile(require.resolve('./remote_clusters_security'));
   });
diff --git a/x-pack/test/functional/apps/saved_objects_management/index.ts b/x-pack/test/functional/apps/saved_objects_management/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function savedObjectsManagementApp({ loadTestFile }: FtrProviderContext) {
   describe('Saved objects management', function savedObjectsManagementAppTestSuite() {
-    this.tags(['ciGroup1', 'skipFirefox']);
+    this.tags(['ciGroup2', 'skipFirefox']);
 
     loadTestFile(require.resolve('./spaces_integration'));
     loadTestFile(require.resolve('./feature_controls/saved_objects_management_security'));
diff --git a/x-pack/test/functional/apps/transform/feature_controls/index.ts b/x-pack/test/functional/apps/transform/feature_controls/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function () {
-    this.tags(['ciGroup1']);
+    this.tags(['ciGroup2']);
 
     loadTestFile(require.resolve('./transform_security'));
   });
diff --git a/x-pack/test/functional/apps/upgrade_assistant/feature_controls/index.ts b/x-pack/test/functional/apps/upgrade_assistant/feature_controls/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('feature controls', function () {
-    this.tags(['ciGroup1']);
+    this.tags(['ciGroup2']);
 
     loadTestFile(require.resolve('./upgrade_assistant_security'));
   });
diff --git a/x-pack/test/functional_basic/apps/index.ts b/x-pack/test/functional_basic/apps/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('apps', function () {
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
 
     loadTestFile(require.resolve('./ml'));
     loadTestFile(require.resolve('./transform'));
diff --git a/x-pack/test/functional_embedded/tests/index.ts b/x-pack/test/functional_embedded/tests/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Kibana embedded', function () {
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
     loadTestFile(require.resolve('./iframe_embedded'));
   });
 }
diff --git a/x-pack/test/licensing_plugin/public/index.ts b/x-pack/test/licensing_plugin/public/index.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../services';
 // eslint-disable-next-line import/no-default-export
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Licensing plugin public client', function () {
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
     loadTestFile(require.resolve('./feature_usage'));
     // MUST BE LAST! CHANGES LICENSE TYPE!
     loadTestFile(require.resolve('./updates'));
diff --git a/x-pack/test/licensing_plugin/server/index.ts b/x-pack/test/licensing_plugin/server/index.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../services';
 // eslint-disable-next-line import/no-default-export
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Licensing plugin server client', function () {
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
     loadTestFile(require.resolve('./info'));
     loadTestFile(require.resolve('./header'));
 
diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/index.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('event_log', function taskManagerSuite() {
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
     loadTestFile(require.resolve('./public_api_integration'));
     loadTestFile(require.resolve('./service_api_integration'));
   });
diff --git a/x-pack/test/plugin_api_integration/test_suites/licensed_feature_usage/index.ts b/x-pack/test/plugin_api_integration/test_suites/licensed_feature_usage/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Licensed feature usage APIs', function () {
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
     loadTestFile(require.resolve('./feature_usage'));
   });
 }
diff --git a/x-pack/test/plugin_api_integration/test_suites/platform/index.ts b/x-pack/test/plugin_api_integration/test_suites/platform/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('platform', function taskManagerSuite() {
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
     loadTestFile(require.resolve('./elasticsearch_client'));
   });
 }
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/index.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('task_manager', function taskManagerSuite() {
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
     loadTestFile(require.resolve('./health_route'));
     loadTestFile(require.resolve('./task_management'));
   });
diff --git a/x-pack/test/plugin_api_perf/test_suites/task_manager/index.ts b/x-pack/test/plugin_api_perf/test_suites/task_manager/index.ts
@@ -14,7 +14,7 @@ export default function ({ loadTestFile }: { loadTestFile: (file: string) => voi
    * worth keeping around for future use, rather than being rewritten time and time again.
    */
   describe.skip('task_manager_perf', function taskManagerSuite() {
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
     loadTestFile(require.resolve('./task_manager_perf_integration'));
   });
 }
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/index.ts b/x-pack/test/reporting_api_integration/reporting_and_security/index.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Reporting APIs', function () {
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
     loadTestFile(require.resolve('./csv_job_params'));
     loadTestFile(require.resolve('./csv_saved_search'));
     loadTestFile(require.resolve('./network_policy'));
diff --git a/x-pack/test/reporting_api_integration/reporting_without_security/index.ts b/x-pack/test/reporting_api_integration/reporting_without_security/index.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Reporting APIs', function () {
-    this.tags('ciGroup1');
+    this.tags('ciGroup2');
     loadTestFile(require.resolve('./job_apis'));
     loadTestFile(require.resolve('./management'));
   });

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../ftr_provider_context';`
`8`	`8`
`9`	`9`	`export default function ({ loadTestFile }: FtrProviderContext) {`
`10`	`10`	`describe('encryptedSavedObjects', function encryptedSavedObjectsSuite() {`
`11`		`- this.tags('ciGroup1');`
	`11`	`+ this.tags('ciGroup2');`
`12`	`12`	`loadTestFile(require.resolve('./encrypted_saved_objects_api'));`
`13`	`13`	`});`
`14`	`14`	`}`