Remove ununsed tests in enmasse 1.0 (EnMasseProject#4844)

* Remove ununsed tests in enmasse 1.0
lulf · Jun 29, 2020 · 1bafdfa · 1bafdfa
1 parent dd13675
commit 1bafdfa
Show file tree

Hide file tree

Showing 161 changed files with 150 additions and 26,533 deletions.
diff --git a/.github/scripts/olm_test.sh b/.github/scripts/olm_test.sh
@@ -6,5 +6,5 @@ export TEMPLATES=${PWD}/templates/build/enmasse-${TAG}
 
 export OCP4_EXTERNAL_IMAGE_REGISTRY=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' image-registry):5000
 
-echo "Running OLM tests"
-time make TESTCASE=olm.** PROFILE=olm-pr systemtests
+echo "OLM TESTS DISABLED"
+#time make TESTCASE=olm.** PROFILE=olm-pr systemtests
diff --git a/.github/scripts/smoke_test.sh b/.github/scripts/smoke_test.sh
@@ -5,4 +5,4 @@ TAG=${TAG:-latest}
 export TEMPLATES=${PWD}/templates/build/enmasse-${TAG}
 
 echo "Running smoke tests"
-time make PROFILE=smoke systemtests
+time make PROFILE=systemtests systemtests
diff --git a/systemtests/pom.xml b/systemtests/pom.xml
@@ -223,130 +223,14 @@
             <id>systemtests</id>
             <properties>
                 <skip.tests>false</skip.tests>
-                <groups>(shared-standard | shared-brokered | isolated | soak | shared-iot | isolated-iot | isolated-shared-infra) &amp; !upgrade</groups>
-            </properties>
-        </profile>
-        <profile>
-            <id>shared</id>
-            <properties>
-                <skip.tests>false</skip.tests>
-                <groups>(shared-standard | shared-brokered) &amp; !isolated &amp; !smoke &amp; !soak
-                    &amp; !shared-iot &amp; !olm &amp; !upgrade &amp; !scale &amp; !framework
-                </groups>
-            </properties>
-        </profile>
-        <profile>
-            <id>isolated-shared-infra</id>
-            <properties>
-                <groups>(isolated-shared-infra) &amp; !soak &amp; !shared-iot &amp; !olm &amp; !upgrade &amp; !scale</groups>
-                <skip.tests>false</skip.tests>
-            </properties>
-        </profile>
-        <profile>
-            <id>isolated</id>
-            <properties>
-                <groups>(isolated | isolated-broker | isolated-standard) &amp; !soak &amp; !shared-iot &amp; !olm &amp; !upgrade &amp; !scale &amp; !framework</groups>
-                <skip.tests>false</skip.tests>
+                <groups>systemtests &amp; !upgrade</groups>
             </properties>
         </profile>
         <profile>
             <id>pr</id>
             <properties>
                 <skip.tests>false</skip.tests>
-                <groups>(shared-standard | shared-brokered | isolated) &amp; !nonPR &amp; !smoke &amp; !soak
-                    &amp; !shared-iot &amp; !olm &amp; !upgrade &amp; !scale &amp; !framework
-                </groups>
-            </properties>
-        </profile>
-        <profile>
-            <id>iot</id>
-            <properties>
-                <groups>(isolated-iot | shared-iot) &amp; !soak &amp; !olm &amp; !upgrade &amp; !scale &amp; !framework</groups>
-                <skip.tests>false</skip.tests>
-            </properties>
-        </profile>
-        <profile>
-            <id>shared-iot</id>
-            <properties>
-                <groups>shared-iot &amp; !soak &amp; !olm &amp; !upgrade &amp; !framework</groups>
-                <skip.tests>false</skip.tests>
-            </properties>
-        </profile>
-        <profile>
-            <id>isolated-iot</id>
-            <properties>
-                <groups>isolated-iot &amp; !soak &amp; !olm &amp; !upgrade &amp; !framework</groups>
-                <skip.tests>false</skip.tests>
-            </properties>
-        </profile>
-        <profile>
-            <id>smoke-iot</id>
-            <properties>
-                <groups>(shared-iot | isolated-iot) &amp; smoke &amp; !soak &amp; !olm &amp; !upgrade &amp; !scale &amp; !framework</groups>
-                <skip.tests>false</skip.tests>
-            </properties>
-        </profile>
-        <profile>
-            <id>soak</id>
-            <properties>
-                <groups>soak</groups>
-                <skip.tests>false</skip.tests>
-            </properties>
-        </profile>
-        <profile>
-            <id>smoke</id>
-            <properties>
-                <groups>smoke &amp; !shared-iot &amp; !isolated-iot &amp; !soak &amp; !olm &amp; !upgrade &amp; !scale &amp; !framework</groups>
-                <skip.tests>false</skip.tests>
-            </properties>
-        </profile>
-        <profile>
-            <id>upgrade</id>
-            <properties>
-                <groups>upgrade &amp; !soak &amp; !olm &amp; !scale &amp; !framework</groups>
-                <skip.tests>false</skip.tests>
-            </properties>
-        </profile>
-        <profile>
-            <id>olm</id>
-            <properties>
-                <groups>olm</groups>
-                <skip.tests>false</skip.tests>
-            </properties>
-        </profile>
-        <profile>
-            <id>olm-pr</id>
-            <properties>
-                <groups>olm &amp; !nonPR</groups>
-                <skip.tests>false</skip.tests>
-            </properties>
-        </profile>
-        <profile>
-            <id>iot-release</id>
-            <properties>
-                <groups>(shared-iot | isolated-iot) &amp; !noneAuth &amp; !smoke &amp; !soak &amp; !olm &amp; !upgrade &amp; !framework</groups>
-                <skip.tests>false</skip.tests>
-            </properties>
-        </profile>
-        <profile>
-            <id>acceptance</id>
-            <properties>
-                <groups>acceptance &amp; !soak &amp; !upgrade &amp; !scale &amp; !framework</groups>
-                <skip.tests>false</skip.tests>
-            </properties>
-        </profile>
-        <profile>
-            <id>acceptance-no-iot</id>
-            <properties>
-                <groups>acceptance &amp; !soak &amp; !upgrade &amp; !shared-iot &amp; !isolated-iot &amp; !scale &amp; !framework</groups>
-                <skip.tests>false</skip.tests>
-            </properties>
-        </profile>
-        <profile>
-            <id>scale</id>
-            <properties>
-                <groups>scale</groups>
-                <skip.tests>false</skip.tests>
+                <groups>systemtests &amp; !upgrade</groups>
             </properties>
         </profile>
         <profile>

diff --git a/systemtests/src/main/java/io/enmasse/systemtest/Environment.java b/systemtests/src/main/java/io/enmasse/systemtest/Environment.java
@@ -102,10 +102,8 @@ public class Environment {
     private final String clusterInternalImageRegistry = getOrDefault(jsonEnv, OCP4_INTERNAL_IMAGE_REGISTRY, "");
 
     //Default values
-    private final UserCredentials managementCredentials = new UserCredentials(null, null);
-    private final UserCredentials defaultCredentials = new UserCredentials(null, null);
-    private final UserCredentials sharedManagementCredentials = new UserCredentials("artemis-admin", "artemis-admin");
-    private final UserCredentials sharedDefaultCredentials = new UserCredentials("test", "test");
+    private final UserCredentials managementCredentials = new UserCredentials("artemis-admin", "artemis-admin");
+    private final UserCredentials defaultCredentials = new UserCredentials("test", "test");
 
     //Collectings properties
     private final String enmasseVersion = System.getProperty(ENMASSE_VERSION_SYSTEM_PROPERTY);
@@ -267,14 +265,6 @@ public UserCredentials getDefaultCredentials() {
         return defaultCredentials;
     }
 
-    public UserCredentials getSharedManagementCredentials() {
-        return sharedManagementCredentials;
-    }
-
-    public UserCredentials getSharedDefaultCredentials() {
-        return sharedDefaultCredentials;
-    }
-
     public boolean isSkipSaveState() {
         return this.skipSaveState;
     }

diff --git a/systemtests/src/main/java/io/enmasse/systemtest/TestTag.java b/systemtests/src/main/java/io/enmasse/systemtest/TestTag.java
@@ -14,9 +14,9 @@
  * This class defines all the tags used in the test suite.
  */
 public class TestTag {
+    public static final String SYSTEMTEST = "systemtests";
     public static final String ISOLATED = "isolated";
     public static final String ISOLATED_STANDARD = "isolated-standard";
-    public static final String ISOLATED_SHARED_INFRA = "isolated-shared-infra";
     public static final String ISOLATED_BROKER = "isolated-broker";
     public static final String SHARED_STANDARD = "shared-standard";
     public static final String SHARED_BROKERED = "shared-brokered";
@@ -32,5 +32,4 @@ public class TestTag {
     public static final String FRAMEWORK = "framework";
     public static final Set<String> SHARED_TAGS = new HashSet<>(Arrays.asList(SHARED_BROKERED, SHARED_STANDARD, SHARED_IOT));
     public static final Set<String> IOT_TAGS = new HashSet<>(Arrays.asList(SHARED_IOT, ISOLATED_IOT));
-    public static final Set<String> SHARED_INFRA_TAGS = new HashSet<>(Arrays.asList(ISOLATED_SHARED_INFRA));
 }
diff --git a/systemtests/src/main/java/io/enmasse/systemtest/bases/ITestBase.java b/systemtests/src/main/java/io/enmasse/systemtest/bases/ITestBase.java
diff --git a/systemtests/src/main/java/io/enmasse/systemtest/bases/ITestBaseBrokered.java b/systemtests/src/main/java/io/enmasse/systemtest/bases/ITestBaseBrokered.java
diff --git a/systemtests/src/main/java/io/enmasse/systemtest/bases/ITestBaseStandard.java b/systemtests/src/main/java/io/enmasse/systemtest/bases/ITestBaseStandard.java
diff --git a/systemtests/src/main/java/io/enmasse/systemtest/bases/iot/ITestIoTBase.java b/systemtests/src/main/java/io/enmasse/systemtest/bases/iot/ITestIoTBase.java
diff --git a/systemtests/src/main/java/io/enmasse/systemtest/bases/iot/ITestIoTIsolated.java b/systemtests/src/main/java/io/enmasse/systemtest/bases/iot/ITestIoTIsolated.java