From 68a6f35a3f9237773b7f29077c3a18e9ca960dbc Mon Sep 17 00:00:00 2001 From: Nicolas Ruflin Date: Mon, 11 Sep 2017 11:16:32 +0200 Subject: [PATCH] Update ES test version to 7.0.0-alpha1 (#5142) 6.0.0-beta1 snapshot does not exist as its not a snapshot anymore. Also master should be tested againts ES 7.0.0-alpha1. --- libbeat/dashboards/es_loader_test.go | 6 ++++-- testing/environments/args.yml | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libbeat/dashboards/es_loader_test.go b/libbeat/dashboards/es_loader_test.go index ce039bbf77e0..0351acca6ae5 100644 --- a/libbeat/dashboards/es_loader_test.go +++ b/libbeat/dashboards/es_loader_test.go @@ -24,7 +24,8 @@ func TestImporter(t *testing.T) { } client := elasticsearch.GetTestingElasticsearch(t) - if strings.HasPrefix(client.Connection.GetVersion(), "6.") { + if strings.HasPrefix(client.Connection.GetVersion(), "6.") || + strings.HasPrefix(client.Connection.GetVersion(), "7.") { t.Skip("Skipping tests for Elasticsearch 6.x releases") } @@ -60,7 +61,8 @@ func TestImporterEmptyBeat(t *testing.T) { } client := elasticsearch.GetTestingElasticsearch(t) - if strings.HasPrefix(client.Connection.GetVersion(), "6.") { + if strings.HasPrefix(client.Connection.GetVersion(), "6.") || + strings.HasPrefix(client.Connection.GetVersion(), "7.") { t.Skip("Skipping tests for Elasticsearch 6.x releases") } diff --git a/testing/environments/args.yml b/testing/environments/args.yml index fd7104210a9e..d3064fa6dacc 100644 --- a/testing/environments/args.yml +++ b/testing/environments/args.yml @@ -6,5 +6,5 @@ services: build: args: DOWNLOAD_URL: https://snapshots.elastic.co/downloads - ELASTIC_VERSION: 6.0.0-beta1-SNAPSHOT - CACHE_BUST: 20170720 + ELASTIC_VERSION: 7.0.0-alpha1-SNAPSHOT + CACHE_BUST: 20170911