Changed TEST_SUITE with free and platinum

ezimuel · ezimuel · commit 1abff92d0d57 · 2021-02-10T21:56:21.000+01:00
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
@@ -1,6 +1,6 @@
 ---
 STACK_VERSION:
-  - 7.11.0-SNAPSHOT
+  - 7.11.0
   
 PHP_VERSION:
   - 8.0-cli
@@ -10,7 +10,7 @@ PHP_VERSION:
   - 7.1-cli
 
 TEST_SUITE:
-  - oss
-  - xpack
+  - free
+  - platinum
 
 exclude: ~
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -58,7 +58,7 @@ jobs:
       run: |
         vendor/bin/phpunit -c phpunit.xml.dist
       env:
-        TEST_SUITE: oss
+        TEST_SUITE: free
 
     - name: Configure sysctl limits
       run: |
@@ -76,4 +76,4 @@ jobs:
       run: |
         vendor/bin/phpunit -c phpunit-integration-tests.xml
       env:
-        TEST_SUITE: oss
+        TEST_SUITE: free
diff --git a/phpunit-yaml-free-tests.xml b/phpunit-yaml-free-tests.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.3/phpunit.xsd"
+         bootstrap="tests/bootstrap.php"
+         colors="true"
+         failOnRisky="true"
+         verbose="true"
+         beStrictAboutChangesToGlobalState="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTestsThatDoNotTestAnything="false"
+>
+    <php>
+        <!-- Disable E_USER_DEPRECATED setting E_ALL & ~E_USER_DEPRECATED-->
+        <ini name="error_reporting" value="16383"/>
+        <ini name="memory_limit" value="-1" />
+    </php>
+    <testsuites>
+        <testsuite name="Yaml tests">
+            <directory>tests/Elasticsearch/Tests/Yaml/Free</directory>
+        </testsuite>
+    </testsuites>
+    <groups>
+        <include>
+            <group>free</group>
+        </include>
+    </groups>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="junit" target="tests/yaml-test-junit.xml"/>
+    </logging>
+</phpunit>
diff --git a/phpunit-yaml-platinum-tests.xml b/phpunit-yaml-platinum-tests.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.3/phpunit.xsd"
+         bootstrap="tests/bootstrap.php"
+         colors="true"
+         failOnRisky="true"
+         verbose="true"
+         beStrictAboutChangesToGlobalState="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTestsThatDoNotTestAnything="false"
+>
+    <php>
+        <!-- Disable E_USER_DEPRECATED setting E_ALL & ~E_USER_DEPRECATED-->
+        <ini name="error_reporting" value="16383"/>
+        <ini name="memory_limit" value="-1" />
+    </php>
+    <testsuites>
+        <testsuite name="Yaml tests">
+            <directory>tests/Elasticsearch/Tests/Yaml/Platinum</directory>
+        </testsuite>
+    </testsuites>
+    <groups>
+        <include>
+            <group>platinum</group>
+        </include>
+    </groups>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="junit" target="tests/yaml-test-junit.xml"/>
+    </logging>
+</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -18,8 +18,8 @@
     <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/Utility.php b/tests/Elasticsearch/Tests/Utility.php
@@ -34,9 +34,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;
diff --git a/util/ActionTest.php b/util/ActionTest.php
@@ -328,15 +328,15 @@ private function skip(array $actions)
                 }
                 switch ($feature) {
                     case 'xpack': 
-                        if (YamlTests::$testSuite !== 'xpack') {
+                        if (YamlTests::$testSuite !== 'platinum') {
                             $this->skippedTest = true;
                             return YamlTests::render(self::TEMPLATE_SKIP_XPACK, [
                                 ':testname' => "__CLASS__ . '::' . __FUNCTION__"
                             ]);
                         } 
                         break;
                     case 'no_xpack': 
-                        if (YamlTests::$testSuite !== 'oss') {
+                        if (YamlTests::$testSuite !== 'free') {
                             $this->skippedTest = true;
                             return YamlTests::render(self::TEMPLATE_SKIP_OSS, [
                                 ':testname' => "__CLASS__ . '::' . __FUNCTION__"
diff --git a/util/YamlTests.php b/util/YamlTests.php
@@ -186,7 +186,7 @@ public function build(): array
                             
                             $skippedTest = sprintf("%s\\%s::%s", $namespace, $testName, $functionName);
                             $skippedAllTest = sprintf("%s\\%s::*", $namespace, $testName);
-                            $skip = strtolower(self::$testSuite) === 'oss' 
+                            $skip = strtolower(self::$testSuite) === 'free' 
                                 ? self::SKIPPED_TEST_OSS 
                                 : self::SKIPPED_TEST_XPACK;
                             if (isset($skip[$skippedAllTest])) {
@@ -232,7 +232,7 @@ public function build(): array
                 );
             } else {
                 $test = self::render(
-                    strtolower(self::$testSuite) === 'oss'
+                    strtolower(self::$testSuite) === 'free'
                         ? self::TEMPLATE_UNIT_TEST_OSS
                         : self::TEMPLATE_UNIT_TEST_XPACK,
                     [
diff --git a/util/build_tests.php b/util/build_tests.php
@@ -20,7 +20,7 @@
 
 if (!isset($argv[2])) {
     printf ("Usage: php %s <ES_VERSION> <TEST_SUITE>\n", $argv[0]);
-    printf ("where <ES_VERSION> is Elasticsearch semantic version and <TEST_SUITE> is 'oss' or 'xpack'\n");
+    printf ("where <ES_VERSION> is Elasticsearch semantic version and <TEST_SUITE> is 'free' or 'platinum'\n");
     exit(1);
 }
 
@@ -31,13 +31,13 @@
 }
 
 $stack = $argv[2];
-if (!in_array($argv[2], ['oss', 'xpack'])) {
-    printf ("The argument <TEST_SUITE> should be 'oss' or 'xpack'\n");
+if (!in_array($argv[2], ['free', 'platinum'])) {
+    printf ("The argument <TEST_SUITE> should be 'free' or 'platinum'\n");
     exit(1);
 }
 
 $yamlOutputTest = __DIR__ . '/../tests/Elasticsearch/Tests/Yaml';
-$yamlTestFolder = strtolower($stack) === 'oss'
+$yamlTestFolder = strtolower($stack) === 'free'
     ? __DIR__ . '/elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/test'
     : __DIR__ . '/elasticsearch/x-pack/plugin/src/test/resources/rest-api-spec/test';
 
diff --git a/util/clean_es_docker.sh b/util/clean_es_docker.sh
@@ -1,9 +1,4 @@
 #!/usr/bin/env bash
 
-if [ "$TEST_SUITE" = "oss" ]; then
-    docker container rm --force --volumes elasticsearch-oss > /dev/null 2>&1 || true
-    docker network rm esnet-oss > /dev/null
-else
-    docker container rm --force --volumes elasticsearch > /dev/null 2>&1 || true
-    docker network rm esnet > /dev/null
-fi
+docker container rm --force --volumes elasticsearch > /dev/null 2>&1 || true
+docker network rm esnet > /dev/null
diff --git a/util/run_es_docker.sh b/util/run_es_docker.sh
@@ -4,14 +4,14 @@ if [ -z $STACK_VERSION ]; then
     exit 1;
 fi
 
-if [ "$TEST_SUITE" != "oss" ] && [ "$TEST_SUITE" != "xpack" ]; then
-    echo "TEST_SUITE must be oss or xpack";
+if [ "$TEST_SUITE" != "free" ] && [ "$TEST_SUITE" != "platinum" ]; then
+    echo "TEST_SUITE must be free or platinum";
     exit 1;
 fi
 
-if [ "$TEST_SUITE" = "oss" ]; then
-    docker pull docker.elastic.co/elasticsearch/elasticsearch-oss:${STACK_VERSION}
-    docker network create esnet-oss;
+if [ "$TEST_SUITE" = "free" ]; then
+    docker pull docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
+    docker network create esnet;
     docker run \
       --rm \
       --publish 9200:9200 \
@@ -22,14 +22,14 @@ if [ "$TEST_SUITE" = "oss" ]; then
       --env "repositories.url.allowed_urls=http://snapshot.*" \
       --env "discovery.type=single-node" \
       --env "ES_JAVA_OPTS=-Xms1g -Xmx1g" \
-      --network=esnet-oss \
-      --name=elasticsearch-oss \
+      --network=esnet \
+      --name=elasticsearch \
       --health-interval=2s \
       --health-retries=20 \
       --health-timeout=2s \
       --detach \
-      docker.elastic.co/elasticsearch/elasticsearch-oss:${STACK_VERSION}
-    docker run --network esnet-oss --rm appropriate/curl --max-time 120 --retry 120 --retry-delay 1 --retry-connrefused --show-error --silent http://elasticsearch-oss:9200
+      docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
+    docker run --network esnet --rm appropriate/curl --max-time 120 --retry 120 --retry-delay 1 --retry-connrefused --show-error --silent http://elasticsearch:9200
 else
     repo=$(pwd)
     testnodecrt="/util/certs/testnode.crt"

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,9 @@ public static function getHost(): ?string`
`34`	`34`	`return $url;`
`35`	`35`	`}`
`36`	`36`	`switch (getenv('TEST_SUITE')) {`
`37`		`- case 'oss':`
	`37`	`+ case 'free':`
`38`	`38`	`return 'http://localhost:9200';`
`39`		`- case 'xpack':`
	`39`	`+ case 'platinum':`
`40`	`40`	`return 'https://elastic:changeme@localhost:9200';`
`41`	`41`	`}`
`42`	`42`	`return null;`