From 62f90b5dac8cf1675b0e83ef5b6540a190d9eb06 Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Wed, 6 Mar 2019 12:38:44 -0600 Subject: [PATCH 1/2] Revert "[kbn/es] pin 7.x snapshot until elastic/elasticsearch#39582 is merged (#32340)" This reverts commit 5285e8b6b626cd538d86758feb0e27b8259008b9. --- packages/kbn-es/src/install/snapshot.js | 5 ----- x-pack/test/upgrade_assistant_integration/config.js | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/kbn-es/src/install/snapshot.js b/packages/kbn-es/src/install/snapshot.js index 0cd0f094faf446..fc5e4684880342 100644 --- a/packages/kbn-es/src/install/snapshot.js +++ b/packages/kbn-es/src/install/snapshot.js @@ -27,11 +27,6 @@ const { BASE_PATH } = require('../paths'); const { installArchive } = require('./archive'); const { log: defaultLog, cache } = require('../utils'); -// pin TEST_ES_SNAPSHOT_VERSION until https://github.com/elastic/elasticsearch/pull/39582 is merged and snapshots have updated -if (!process.env.TEST_ES_SNAPSHOT_VERSION) { - process.env.TEST_ES_SNAPSHOT_VERSION = '7.1.0-36d8499e'; -} - /** * Download an ES snapshot * diff --git a/x-pack/test/upgrade_assistant_integration/config.js b/x-pack/test/upgrade_assistant_integration/config.js index 36a4a44a7ecb62..2992600be2db12 100644 --- a/x-pack/test/upgrade_assistant_integration/config.js +++ b/x-pack/test/upgrade_assistant_integration/config.js @@ -9,6 +9,9 @@ import { EsProvider, } from './services'; +// Temporary until https://github.com/elastic/kibana/pull/29184 is merged +delete process.env.TEST_ES_SNAPSHOT_VERSION; + export default async function ({ readConfigFile }) { // Read the Kibana API integration tests config file so that we can utilize its services. From 68858620736b482fcb00cf1058f8ed61fb5c0371 Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Wed, 6 Mar 2019 12:52:34 -0600 Subject: [PATCH 2/2] Update config.js --- x-pack/test/upgrade_assistant_integration/config.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/x-pack/test/upgrade_assistant_integration/config.js b/x-pack/test/upgrade_assistant_integration/config.js index 2992600be2db12..36a4a44a7ecb62 100644 --- a/x-pack/test/upgrade_assistant_integration/config.js +++ b/x-pack/test/upgrade_assistant_integration/config.js @@ -9,9 +9,6 @@ import { EsProvider, } from './services'; -// Temporary until https://github.com/elastic/kibana/pull/29184 is merged -delete process.env.TEST_ES_SNAPSHOT_VERSION; - export default async function ({ readConfigFile }) { // Read the Kibana API integration tests config file so that we can utilize its services.