Refactored TEST_SUITE with free, platinum + removed old YamlRunnerTest

elastic · Feb 18, 2021 · f69d96f · f69d96f
1 parent 3fa0b98
commit f69d96f
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 1,295 deletions.
diff --git a/.ci/functions/imports.sh b/.ci/functions/imports.sh
@@ -18,7 +18,7 @@ require_stack_version
 if [[ -z $es_node_name ]]; then
   # only set these once
   set -euo pipefail
-  export TEST_SUITE=${TEST_SUITE-oss}
+  export TEST_SUITE=${TEST_SUITE-free}
   export RUNSCRIPTS=${RUNSCRIPTS-}
   export DETACH=${DETACH-false}
   export CLEANUP=${CLEANUP-false}
@@ -27,8 +27,7 @@ if [[ -z $es_node_name ]]; then
   export elastic_password=changeme
   export elasticsearch_image=elasticsearch
   export elasticsearch_url=https://elastic:${elastic_password}@${es_node_name}:9200
-  if [[ $TEST_SUITE != "xpack" ]]; then
-    export elasticsearch_image=elasticsearch-${TEST_SUITE}
+  if [[ $TEST_SUITE != "platinum" ]]; then
     export elasticsearch_url=http://${es_node_name}:9200
   fi
   export external_elasticsearch_url=${elasticsearch_url/$es_node_name/localhost}

diff --git a/.ci/run-elasticsearch.sh b/.ci/run-elasticsearch.sh
@@ -4,7 +4,7 @@
 # to form a cluster suitable for running the REST API tests.
 #
 # Export the STACK_VERSION variable, eg. '8.0.0-SNAPSHOT'.
-# Export the TEST_SUITE variable, eg. 'oss' or 'xpack' defaults to 'oss'.
+# Export the TEST_SUITE variable, eg. 'free' or 'platinum' defaults to 'free'.
 # Export the NUMBER_OF_NODES variable to start more than 1 node
 
 # Version 1.2.0
@@ -39,7 +39,7 @@ environment=($(cat <<-END
   --env repositories.url.allowed_urls=http://snapshot.test*
 END
 ))
-if [[ "$TEST_SUITE" == "xpack" ]]; then
+if [[ "$TEST_SUITE" == "platinum" ]]; then
   environment+=($(cat <<-END
     --env ELASTIC_PASSWORD=$elastic_password
     --env xpack.license.self_generated.type=trial
@@ -64,7 +64,7 @@ END
 fi
 
 cert_validation_flags=""
-if [[ "$TEST_SUITE" == "xpack" ]]; then
+if [[ "$TEST_SUITE" == "platinum" ]]; then
   cert_validation_flags="--insecure --cacert /usr/share/elasticsearch/config/certs/ca.crt --resolve ${es_node_name}:443:127.0.0.1"
 fi
 

diff --git a/.ci/test-matrix.yml b/.ci/test-matrix.yml
@@ -10,7 +10,7 @@ PHP_VERSION:
   - 7.1-cli
 
 TEST_SUITE:
-  - oss
-  - xpack
+  - free
+  - platinum
 
 exclude: ~
diff --git a/phpunit-integration-tests.xml b/phpunit-integration-tests.xml
@@ -12,7 +12,6 @@
     <testsuites>
         <testsuite name="Integration tests">
             <directory>tests</directory>
-            <exclude>tests/Elasticsearch/Tests/YamlRunnerTest.php</exclude>
         </testsuite>
     </testsuites>
     <groups>

diff --git a/phpunit-yaml-oss-tests.xml → phpunit-yaml-free-tests.xml b/phpunit-yaml-oss-tests.xml → phpunit-yaml-free-tests.xml
@@ -16,12 +16,12 @@
     </php>
     <testsuites>
         <testsuite name="Yaml tests">
-            <directory>tests/Elasticsearch/Tests/Yaml/Oss</directory>
+            <directory>tests/Elasticsearch/Tests/Yaml/Free</directory>
         </testsuite>
     </testsuites>
     <groups>
         <include>
-            <group>oss</group>
+            <group>free</group>
         </include>
     </groups>
     <filter>

diff --git a/phpunit-yaml-xpack-tests.xml → phpunit-yaml-platinum-tests.xml b/phpunit-yaml-xpack-tests.xml → phpunit-yaml-platinum-tests.xml
@@ -16,12 +16,12 @@
     </php>
     <testsuites>
         <testsuite name="Yaml tests">
-            <directory>tests/Elasticsearch/Tests/Yaml/Xpack</directory>
+            <directory>tests/Elasticsearch/Tests/Yaml/Platinum</directory>
         </testsuite>
     </testsuites>
     <groups>
         <include>
-            <group>xpack</group>
+            <group>platinum</group>
         </include>
     </groups>
     <filter>

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -12,14 +12,13 @@
     <testsuites>
         <testsuite name="Unit tests">
             <directory>tests</directory>
-            <exclude>tests/Elasticsearch/Tests/YamlRunnerTest.php</exclude>
         </testsuite>
     </testsuites>
     <groups>
         <exclude>
             <group>Integration</group>
-            <group>oss</group>
-            <group>xpack</group>
+            <group>free</group>
+            <group>platinum</group>
         </exclude>
     </groups>
     <filter>

diff --git a/tests/Elasticsearch/Tests/ClientIntegrationTest.php b/tests/Elasticsearch/Tests/ClientIntegrationTest.php
@@ -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();

diff --git a/tests/Elasticsearch/Tests/Utility.php b/tests/Elasticsearch/Tests/Utility.php
@@ -35,9 +35,9 @@ public static function getHost(): ?string
             return $url;
         }
         switch (getenv('TEST_SUITE')) {
-            case 'oss':
+            case 'free':
                 return 'http://localhost:9200';
-            case 'xpack':
+            case 'platinum':
                 return 'https://elastic:changeme@localhost:9200';
         }
         return null;
@@ -57,7 +57,7 @@ public static function getClient(): Client
                 ]
             ]
         ]);
-        if (getenv('TEST_SUITE') === 'xpack') {
+        if (getenv('TEST_SUITE') === 'platinum') {
             $clientBuilder->setSSLVerification(false);
         }
         return $clientBuilder->build();
@@ -108,21 +108,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
@@ -141,7 +141,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);