Revert "[FTR][CI] Use default distribution for all tests (elastic#94968…

…)" This reverts commit 537be25.
tylersmalley · Jun 3, 2021 · 0280b31 · 0280b31
1 parent 2956993
commit 0280b31
Show file tree

Hide file tree

Showing 32 changed files with 672 additions and 2,841 deletions.
diff --git a/.ci/Jenkinsfile_flaky b/.ci/Jenkinsfile_flaky
@@ -73,7 +73,11 @@ def agentProcess(Map params = [:]) {
       ]) {
         task {
           if (config.needBuild) {
-            kibanaPipeline.buildKibana()
+            if (!config.isXpack) {
+              kibanaPipeline.buildOss()
+            } else {
+              kibanaPipeline.buildXpack()
+            }
           }
 
           for(def i = 0; i < config.agentExecutions; i++) {

diff --git a/.ci/Jenkinsfile_security_cypress b/.ci/Jenkinsfile_security_cypress
@@ -16,7 +16,7 @@ kibanaPipeline(timeoutMinutes: 180) {
         def job = 'xpack-securityCypress'
 
         workers.ci(name: job, size: 'l', ramDisk: true) {
-          kibanaPipeline.bash('test/scripts/jenkins_build_kibana.sh', 'Build Distributable')
+          kibanaPipeline.bash('test/scripts/jenkins_xpack_build_kibana.sh', 'Build Default Distributable')
           kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_chrome.sh')()
           // Temporarily disabled to figure out test flake
           // kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_firefox.sh')()

diff --git a/.ci/es-snapshots/Jenkinsfile_verify_es b/.ci/es-snapshots/Jenkinsfile_verify_es
@@ -37,8 +37,12 @@ kibanaPipeline(timeoutMinutes: 210) {
           ])
 
           task {
-            kibanaPipeline.buildKibana(16)
+            kibanaPipeline.buildOss(6)
             tasks.ossCiGroups()
+          }
+
+          task {
+            kibanaPipeline.buildXpack(10, true)
             tasks.xpackCiGroups()
             tasks.xpackCiGroupDocker()
           }

diff --git a/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts b/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
@@ -165,7 +165,6 @@ export async function createDefaultSpace({
     {
       index,
       id: 'space:default',
-      refresh: 'wait_for',
       body: {
         type: 'space',
         updated_at: new Date().toISOString(),

diff --git a/test/accessibility/apps/dashboard_panel.ts b/test/accessibility/apps/dashboard_panel.ts
@@ -63,8 +63,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     it('dashboard panel full screen', async () => {
       const header = await dashboardPanelActions.getPanelHeading('[Flights] Airline Carrier');
       await dashboardPanelActions.toggleContextMenu(header);
-      await dashboardPanelActions.clickContextMenuMoreItem();
-
       await testSubjects.click('embeddablePanelAction-togglePanel');
       await a11y.testAppSnapshot();
     });

diff --git a/test/api_integration/apis/home/sample_data.ts b/test/api_integration/apis/home/sample_data.ts
@@ -43,7 +43,7 @@ export default function ({ getService }: FtrProviderContext) {
 
         expect(resp.body).to.eql({
           elasticsearchIndicesCreated: { kibana_sample_data_flights: 13059 },
-          kibanaSavedObjectsLoaded: 23,
+          kibanaSavedObjectsLoaded: 20,
         });
       });
 

diff --git a/test/api_integration/apis/search/search.ts b/test/api_integration/apis/search/search.ts
@@ -99,6 +99,26 @@ export default function ({ getService }: FtrProviderContext) {
         expect(resp.body.message).to.contain('banana not found');
       });
 
+      it('should return 400 when index type is provided in OSS', async () => {
+        const resp = await supertest
+          .post(`/internal/search/es`)
+          .send({
+            indexType: 'baad',
+            params: {
+              body: {
+                query: {
+                  match_all: {},
+                },
+              },
+            },
+          })
+          .expect(400);
+
+        verifyErrorResponse(resp.body, 400);
+
+        expect(resp.body.message).to.contain('Unsupported index pattern');
+      });
+
       it('should return 400 with illegal ES argument', async () => {
         const resp = await supertest
           .post(`/internal/search/es`)

diff --git a/test/api_integration/apis/telemetry/index.js b/test/api_integration/apis/telemetry/index.js
@@ -8,6 +8,7 @@
 
 export default function ({ loadTestFile }) {
   describe('Telemetry', () => {
+    loadTestFile(require.resolve('./telemetry_local'));
     loadTestFile(require.resolve('./opt_in'));
     loadTestFile(require.resolve('./telemetry_optin_notice_seen'));
   });