Skip to content

Commit 0e225a3

Browse files
authored
[transform] move loadIfNeeded in index file, remove unloading and afterAll hook on finish (#271265)
## Summary Doing the same changes over each Transform FTR config to cut CI runtime: - Add one await `esArchiver.loadIfNeeded('X')` in the index file's before hook. - Delete the per-child `loadIfNeeded('X')` calls. - Delete any `esArchiver.unload('X')` in the index after hook. Since we stop servers after each FTR config is finished, unloading data is wasted time. Some numbers: - `loadIfNeeded` calls eliminated per CI run: 12 (hoisted once per suite instead of once per child) - `esArchiver.unload(...)` calls removed: 12 (2 per index file × 6 suites) - Total esArchiver ops eliminated per CI run: ~24 Since each FTR config gets its own fresh ES+Kibana instance, none of the top-level after hooks have any effect on subsequent configs. Saving time by removing them and related calls across all 6 suites: - `transform.securityUI.logout()` — browser session is killed with the server anyway - `transform.securityCommon.cleanTransformUsers/Roles()` — ES security objects destroyed with the server - `transform.testResources.resetKibanaTimeZone()` — Kibana instance destroyed with the server
1 parent 1091e85 commit 0e225a3

18 files changed

Lines changed: 5 additions & 103 deletions

File tree

x-pack/platform/test/functional/apps/transform/actions/deleting.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import type { FtrProviderContext } from '../../../ftr_provider_context';
1111
import { getLatestTransformConfig, getPivotTransformConfig } from '../helpers';
1212

1313
export default function ({ getService }: FtrProviderContext) {
14-
const esArchiver = getService('esArchiver');
1514
const transform = getService('transform');
1615

1716
describe('deleting', function () {
@@ -64,7 +63,6 @@ export default function ({ getService }: FtrProviderContext) {
6463
];
6564

6665
before(async () => {
67-
await esArchiver.loadIfNeeded('x-pack/platform/test/fixtures/es_archives/ml/ecommerce');
6866
await transform.testResources.createDataViewIfNeeded('ft_ecommerce', 'order_date');
6967

7068
for (const testData of testDataList) {

x-pack/platform/test/functional/apps/transform/actions/index.ts

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
1717
before(async () => {
1818
await transform.securityCommon.createTransformRoles();
1919
await transform.securityCommon.createTransformUsers();
20-
});
21-
22-
after(async () => {
23-
// NOTE: Logout needs to happen before anything else to avoid flaky behavior
24-
await transform.securityUI.logout();
25-
26-
await transform.securityCommon.cleanTransformUsers();
27-
await transform.securityCommon.cleanTransformRoles();
28-
29-
await esArchiver.unload('x-pack/platform/test/fixtures/es_archives/ml/farequote');
30-
await esArchiver.unload('x-pack/platform/test/fixtures/es_archives/ml/ecommerce');
31-
32-
await transform.testResources.resetKibanaTimeZone();
20+
await esArchiver.loadIfNeeded('x-pack/platform/test/fixtures/es_archives/ml/ecommerce');
3321
});
3422

3523
loadTestFile(require.resolve('./deleting'));

x-pack/platform/test/functional/apps/transform/actions/reauthorizing.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ function generateHeaders(apiKey: SecurityCreateApiKeyResponse, version?: string)
5454
}
5555

5656
export default function ({ getService }: FtrProviderContext) {
57-
const esArchiver = getService('esArchiver');
5857
const transform = getService('transform');
5958

6059
const apiKeysForTransformUsers = new Map<USER, SecurityCreateApiKeyResponse>();
@@ -137,7 +136,6 @@ export default function ({ getService }: FtrProviderContext) {
137136
apiKeysForTransformUsers.set(user.name as USER, apiKey)
138137
);
139138

140-
await esArchiver.loadIfNeeded('x-pack/platform/test/fixtures/es_archives/ml/ecommerce');
141139
await transform.testResources.createDataViewIfNeeded('ft_ecommerce', 'order_date');
142140

143141
for (const testData of testDataList) {

x-pack/platform/test/functional/apps/transform/actions/resetting.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import type { FtrProviderContext } from '../../../ftr_provider_context';
1111
import { getLatestTransformConfig, getPivotTransformConfig } from '../helpers';
1212

1313
export default function ({ getService }: FtrProviderContext) {
14-
const esArchiver = getService('esArchiver');
1514
const transform = getService('transform');
1615

1716
describe('resetting', function () {
@@ -66,7 +65,6 @@ export default function ({ getService }: FtrProviderContext) {
6665
];
6766

6867
before(async () => {
69-
await esArchiver.loadIfNeeded('x-pack/platform/test/fixtures/es_archives/ml/ecommerce');
7068
await transform.testResources.createDataViewIfNeeded('ft_ecommerce', 'order_date');
7169

7270
for (const testData of testDataList) {

x-pack/platform/test/functional/apps/transform/actions/starting.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ interface TestDataLatest {
4545
type TestData = TestDataPivot | TestDataLatest;
4646

4747
export default function ({ getService }: FtrProviderContext) {
48-
const esArchiver = getService('esArchiver');
4948
const transform = getService('transform');
5049

5150
describe('starting', function () {
@@ -109,7 +108,6 @@ export default function ({ getService }: FtrProviderContext) {
109108
];
110109

111110
before(async () => {
112-
await esArchiver.loadIfNeeded('x-pack/platform/test/fixtures/es_archives/ml/ecommerce');
113111
await transform.testResources.createDataViewIfNeeded('ft_ecommerce', 'order_date');
114112

115113
for (const testData of testDataList) {

x-pack/platform/test/functional/apps/transform/creation/index_pattern/creation_index_pattern.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ import { isLatestTransformTestData, isPivotTransformTestData } from '../../helpe
1313

1414
export default function ({ getService, getPageObjects }: FtrProviderContext) {
1515
const canvasElement = getService('canvasElement');
16-
const esArchiver = getService('esArchiver');
1716
const transform = getService('transform');
1817
const pageObjects = getPageObjects(['discover']);
1918

2019
describe('creation_index_pattern', function () {
2120
before(async () => {
22-
await esArchiver.loadIfNeeded('x-pack/platform/test/fixtures/es_archives/ml/ecommerce');
2321
await transform.testResources.createDataViewIfNeeded('ft_ecommerce', 'order_date');
2422
await transform.testResources.setKibanaTimeZoneToUTC();
2523

x-pack/platform/test/functional/apps/transform/creation/index_pattern/index.ts

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
1717
before(async () => {
1818
await transform.securityCommon.createTransformRoles();
1919
await transform.securityCommon.createTransformUsers();
20-
});
21-
22-
after(async () => {
23-
// NOTE: Logout needs to happen before anything else to avoid flaky behavior
24-
await transform.securityUI.logout();
25-
26-
await transform.securityCommon.cleanTransformUsers();
27-
await transform.securityCommon.cleanTransformRoles();
28-
29-
await esArchiver.unload('x-pack/platform/test/fixtures/es_archives/ml/farequote');
30-
await esArchiver.unload('x-pack/platform/test/fixtures/es_archives/ml/ecommerce');
31-
32-
await transform.testResources.resetKibanaTimeZone();
20+
await esArchiver.loadIfNeeded('x-pack/platform/test/fixtures/es_archives/ml/ecommerce');
3321
});
3422

3523
loadTestFile(require.resolve('./creation_index_pattern'));

x-pack/platform/test/functional/apps/transform/creation/index_pattern/wizard_max_page_search_size_reset.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ import {
1313
import type { FtrProviderContext } from '../../../../ftr_provider_context';
1414

1515
export default function ({ getService }: FtrProviderContext) {
16-
const esArchiver = getService('esArchiver');
1716
const transform = getService('transform');
1817

1918
describe('wizard max_page_search_size reset', function () {
2019
before(async () => {
21-
await esArchiver.loadIfNeeded('x-pack/platform/test/fixtures/es_archives/ml/ecommerce');
2220
await transform.testResources.createDataViewIfNeeded('ft_ecommerce', 'order_date');
2321
await transform.testResources.setKibanaTimeZoneToUTC();
2422
await transform.securityUI.loginAsTransformPowerUser();

x-pack/platform/test/functional/apps/transform/creation/runtime_mappings_saved_search/creation_runtime_mappings.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import type { GroupByEntry, LatestTransformTestData, PivotTransformTestData } fr
1414
import { isLatestTransformTestData, isPivotTransformTestData } from '../../helpers';
1515

1616
export default function ({ getService }: FtrProviderContext) {
17-
const esArchiver = getService('esArchiver');
1817
const transform = getService('transform');
1918

2019
const runtimeMappings = {
@@ -30,7 +29,6 @@ export default function ({ getService }: FtrProviderContext) {
3029

3130
describe('creation with runtime mappings', function () {
3231
before(async () => {
33-
await esArchiver.loadIfNeeded('x-pack/platform/test/fixtures/es_archives/ml/farequote');
3432
await transform.testResources.createDataViewIfNeeded('ft_farequote', '@timestamp');
3533
await transform.testResources.setKibanaTimeZoneToUTC();
3634

x-pack/platform/test/functional/apps/transform/creation/runtime_mappings_saved_search/creation_saved_search.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ import type { GroupByEntry, LatestTransformTestData, PivotTransformTestData } fr
1212
import { isLatestTransformTestData, isPivotTransformTestData } from '../../helpers';
1313

1414
export default function ({ getService }: FtrProviderContext) {
15-
const esArchiver = getService('esArchiver');
1615
const transform = getService('transform');
1716

1817
describe('creation_saved_search', function () {
1918
before(async () => {
20-
await esArchiver.loadIfNeeded('x-pack/platform/test/fixtures/es_archives/ml/farequote');
2119
await transform.testResources.createDataViewIfNeeded('ft_farequote', '@timestamp');
2220
await transform.testResources.createSavedSearchFarequoteFilterIfNeeded();
2321
await transform.testResources.setKibanaTimeZoneToUTC();

0 commit comments

Comments
 (0)