Skip to content

Commit

Permalink
Removed the latest xpack,oss TEST_SUITE
Browse files Browse the repository at this point in the history
  • Loading branch information
ezimuel committed Feb 10, 2021
1 parent facea33 commit 9458f55
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion tests/Elasticsearch/Tests/ClientIntegrationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private function getClient(): Client
->setHosts([$this->host])
->setLogger($this->logger);

if (getenv('TEST_SUITE') === 'xpack') {
if (getenv('TEST_SUITE') === 'platinum') {
$client->setSSLVerification(__DIR__ . '/../../../.ci/certs/ca.crt');
}
return $client->build();
Expand Down
8 changes: 4 additions & 4 deletions tests/Elasticsearch/Tests/Utility.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,21 +107,21 @@ public static function cleanUpCluster(Client $client): void
*/
private static function wipeCluster(Client $client): void
{
if (getenv('TEST_SUITE') === 'xpack') {
if (getenv('TEST_SUITE') === 'platinum') {
self::wipeRollupJobs($client);
self::waitForPendingRollupTasks($client);
self::deleteAllSLMPolicies($client);
}

self::wipeSnapshots($client);

if (getenv('TEST_SUITE') === 'xpack') {
if (getenv('TEST_SUITE') === 'platinum') {
self::wipeDataStreams($client);
}

self::wipeAllIndices($client);

if (getenv('TEST_SUITE') === 'xpack') {
if (getenv('TEST_SUITE') === 'platinum') {
self::wipeTemplateForXpack($client);
} else {
// Delete templates
Expand All @@ -140,7 +140,7 @@ private static function wipeCluster(Client $client): void

self::wipeClusterSettings($client);

if (getenv('TEST_SUITE') === 'xpack') {
if (getenv('TEST_SUITE') === 'platinum') {
self::deleteAllILMPolicies($client);
self::deleteAllAutoFollowPatterns($client);
self::deleteAllTasks($client);
Expand Down
4 changes: 2 additions & 2 deletions tests/Elasticsearch/Tests/YamlRunnerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public static function getHost(): string
{
$host = Utility::getHost();
if (null == $host) {
echo 'Environment variable TEST_SUITE (oss, xpack) not defined.';
echo 'Environment variable TEST_SUITE (free, platinum) not defined.';
exit;
}
return $host;
Expand Down Expand Up @@ -1147,7 +1147,7 @@ private function clean()
'name' => '*'
]);

if (getenv('TEST_SUITE') === 'xpack') {
if (getenv('TEST_SUITE') === 'platinum') {
# Get all roles
$roles = $this->client->security()->getRole();
# Delete custom roles (metadata._reserved = 0)
Expand Down

0 comments on commit 9458f55

Please sign in to comment.