Skip to content

Commit

Permalink
[kbn/es] pin 7.x snapshot until elastic/elasticsearch#39582 is merged (
Browse files Browse the repository at this point in the history
…elastic#32340)

* [kbn/es] pin 7.x snapshot until elastic#39582 is merged

* snapshot needs version number

* need to use an older snapshot

* who checks todos?
  • Loading branch information
Spencer authored Mar 1, 2019
1 parent a07cd5b commit 5285e8b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 5 additions & 0 deletions packages/kbn-es/src/install/snapshot.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ 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
*
Expand Down
3 changes: 0 additions & 3 deletions x-pack/test/upgrade_assistant_integration/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 5285e8b

Please sign in to comment.