Skip to content

Commit 4044355

Browse files
committed
Updated endpoints for 7.11 + changed basic/platinum matrix
1 parent 4a6543f commit 4044355

28 files changed

+671
-171
lines changed

.ci/functions/imports.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require_stack_version
1818
if [[ -z $es_node_name ]]; then
1919
# only set these once
2020
set -euo pipefail
21-
export TEST_SUITE=${TEST_SUITE-oss}
21+
export TEST_SUITE=${TEST_SUITE-free}
2222
export RUNSCRIPTS=${RUNSCRIPTS-}
2323
export DETACH=${DETACH-false}
2424
export CLEANUP=${CLEANUP-false}
@@ -27,8 +27,7 @@ if [[ -z $es_node_name ]]; then
2727
export elastic_password=changeme
2828
export elasticsearch_image=elasticsearch
2929
export elasticsearch_url=https://elastic:${elastic_password}@${es_node_name}:9200
30-
if [[ $TEST_SUITE != "xpack" ]]; then
31-
export elasticsearch_image=elasticsearch-${TEST_SUITE}
30+
if [[ $TEST_SUITE != "platinum" ]]; then
3231
export elasticsearch_url=http://${es_node_name}:9200
3332
fi
3433
export external_elasticsearch_url=${elasticsearch_url/$es_node_name/localhost}

.ci/run-elasticsearch.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
# to form a cluster suitable for running the REST API tests.
55
#
66
# Export the STACK_VERSION variable, eg. '8.0.0-SNAPSHOT'.
7-
# Export the TEST_SUITE variable, eg. 'oss' or 'xpack' defaults to 'oss'.
7+
# Export the TEST_SUITE variable, eg. 'free' or 'platinum' defaults to 'free'.
88
# Export the NUMBER_OF_NODES variable to start more than 1 node
99

10-
# Version 1.1.0
10+
# Version 1.2.0
1111
# - Initial version of the run-elasticsearch.sh script
1212
# - Deleting the volume should not dependent on the container still running
1313
# - Fixed `ES_JAVA_OPTS` config
1414
# - Moved to STACK_VERSION and TEST_VERSION
1515
# - Refactored into functions and imports
1616
# - Support NUMBER_OF_NODES
17+
# - Added 5 retries on docker pull for fixing transient network errors
1718

1819
script_path=$(dirname $(realpath -s $0))
1920
source $script_path/functions/imports.sh
@@ -38,7 +39,7 @@ environment=($(cat <<-END
3839
--env repositories.url.allowed_urls=http://snapshot.test*
3940
END
4041
))
41-
if [[ "$TEST_SUITE" == "xpack" ]]; then
42+
if [[ "$TEST_SUITE" == "platinum" ]]; then
4243
environment+=($(cat <<-END
4344
--env ELASTIC_PASSWORD=$elastic_password
4445
--env xpack.license.self_generated.type=trial
@@ -63,7 +64,7 @@ END
6364
fi
6465

6566
cert_validation_flags=""
66-
if [[ "$TEST_SUITE" == "xpack" ]]; then
67+
if [[ "$TEST_SUITE" == "platinum" ]]; then
6768
cert_validation_flags="--insecure --cacert /usr/share/elasticsearch/config/certs/ca.crt --resolve ${es_node_name}:443:127.0.0.1"
6869
fi
6970

.ci/test-matrix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ PERL_VERSION:
99
- 5.28
1010

1111
TEST_SUITE:
12-
- oss
13-
- xpack
12+
- basic
13+
- platinum
1414

1515
CLIENT_VER:
1616
- 7_0

build/parse_spec_base_74.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
our ( %API, %Common, %seen, %seen_combo, %Forbidden );
3030

31-
our %Known_Types = map { $_ => 1 } qw(boolean enum date list number int float double string time number|string);
31+
our %Known_Types = map { $_ => 1 } qw(boolean enum date list number int float double string time number|string boolean|long);
3232

3333
#===================================
3434
sub process_files {

lib/Search/Elasticsearch.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use Moo 2.001000 ();
2222
use Search::Elasticsearch::Util qw(parse_params load_plugin);
2323
use namespace::clean;
2424

25-
our $VERSION = '7.100_1';
25+
our $VERSION = '7.110';
2626

2727
my %Default_Plugins = (
2828
client => [ 'Search::Elasticsearch::Client', '7_0::Direct' ],

lib/Search/Elasticsearch/Async.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package Search::Elasticsearch::Async;
1919

20-
our $VERSION = '7.100_1';
20+
our $VERSION = '7.110';
2121
use Search::Elasticsearch 7.00;
2222
use Promises 0.93 ();
2323
use parent 'Search::Elasticsearch';

lib/Search/Elasticsearch/Client/6_0.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package Search::Elasticsearch::Client::6_0;
1919

20-
our $VERSION='7.30';
20+
our $VERSION='7.110';
2121
use Search::Elasticsearch 7.00 ();
2222

2323
1;

lib/Search/Elasticsearch/Client/6_0/Async.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package Search::Elasticsearch::Client::6_0::Async;
1919

20-
our $VERSION='7.30';
20+
our $VERSION='7.110';
2121
use Search::Elasticsearch::Client::7_0 7.00 ();
2222

2323
1;

lib/Search/Elasticsearch/Client/7_0.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package Search::Elasticsearch::Client::7_0;
1919

20-
our $VERSION='7.30';
20+
our $VERSION='7.110';
2121
use Search::Elasticsearch 7.00 ();
2222

2323
1;

lib/Search/Elasticsearch/Client/7_0/Async.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package Search::Elasticsearch::Client::7_0::Async;
1919

20-
our $VERSION='7.30';
20+
our $VERSION='7.110';
2121
use Search::Elasticsearch::Client::7_0 7.00 ();
2222

2323
1;

0 commit comments

Comments
 (0)