revert elastic#141437 and switch back to fixed journey ordering

spalger · Sep 22, 2022 · da8eb44 · da8eb44
1 parent e8e1203
commit da8eb44
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/.buildkite/scripts/steps/functional/performance_playwright.sh b/.buildkite/scripts/steps/functional/performance_playwright.sh
@@ -46,7 +46,9 @@ unset ELASTIC_APM_SERVER_URL
 unset ELASTIC_APM_SECRET_TOKEN
 unset ELASTIC_APM_GLOBAL_LABELS
 
-for journey in x-pack/performance/journeys/*; do
+journeys=("login" "ecommerce_dashboard" "flight_dashboard" "web_logs_dashboard" "promotion_tracking_dashboard" "many_fields_discover" "data_stress_test_lens")
+
+for journey in "${journeys[@]}"; do
   set +e
 
   phases=("WARMUP" "TEST")

diff --git a/packages/kbn-journeys/journey/journey_ftr_harness.ts b/packages/kbn-journeys/journey/journey_ftr_harness.ts
@@ -120,19 +120,12 @@ export class JourneyFtrHarness {
     await Promise.all([
       this.setupApm(),
       this.setupBrowserAndPage(),
-      (async () => {
-        await Promise.all([
-          asyncForEach(this.journeyConfig.getEsArchives(), async (esArchive) => {
-            await this.esArchiver.load(esArchive);
-          }),
-          asyncForEach(this.journeyConfig.getKbnArchives(), async (kbnArchive) => {
-            await this.kibanaServer.importExport.load(kbnArchive);
-          }),
-        ]);
-
-        // wait after loading the data, before doing any querying in tests
-        await setTimeout(10_000);
-      })(),
+      asyncForEach(this.journeyConfig.getEsArchives(), async (esArchive) => {
+        await this.esArchiver.load(esArchive);
+      }),
+      asyncForEach(this.journeyConfig.getKbnArchives(), async (kbnArchive) => {
+        await this.kibanaServer.importExport.load(kbnArchive);
+      }),
     ]);
   }