Merge branch '7.x' into backport/7.x/pr-85706

elastic · Dec 15, 2020 · 129fa8f · 129fa8f
2 parents fd7daa6 + eadb9cd
commit 129fa8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/x-pack/test/functional/apps/discover/async_scripted_fields.js b/x-pack/test/functional/apps/discover/async_scripted_fields.js
@@ -72,7 +72,7 @@ export default function ({ getService, getPageObjects }) {
       });
     });
 
-    it('query return results with valid scripted field', async function () {
+    it.skip('query return results with valid scripted field', async function () {
       if (false) {
         /* the commented-out steps below were used to create the scripted fields in the logstash-* index pattern
         which are now saved in the esArchive.

diff --git a/x-pack/test/functional/apps/uptime/ping_redirects.ts b/x-pack/test/functional/apps/uptime/ping_redirects.ts
@@ -18,7 +18,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
   const monitor = () => uptime.monitor;
 
-  describe('Ping redirects', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/84992
+  describe.skip('Ping redirects', () => {
     const start = '~ 15 minutes ago';
     const end = 'now';