Another matrix reorder

Signed-off-by: Pawel Gudel <[email protected]>
opensearch-project · Jun 27, 2023 · d618b3d · d618b3d
1 parent c0541dc
commit d618b3d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       separateTestsNames: ${{ steps.set-matrix.outputs.separateTestsNames }}
-      testsNamesExclude: ${{ steps.set-matrix.outputs.testsNamesExclude }}
     steps:
     - name: Set up JDK for build and test
       uses: actions/setup-java@v2
@@ -31,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: ["windows-latest", "ubuntu-latest"]
+        platform: [windows-latest, ubuntu-latest]
         jdk: [11, 17]
     runs-on: ${{ matrix.platform }}
 
@@ -75,9 +74,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: ["windows-latest", "ubuntu-latest"]
-        jdk: [11, 17]
         gradle_task: ${{ fromJson(needs.generate-test-list.outputs.separateTestsNames) }}
+        jdk: [11, 17]
+        platform: [windows-latest, ubuntu-latest]
     runs-on: ${{ matrix.platform }}
 
     steps:
@@ -120,7 +119,7 @@ jobs:
       fail-fast: false
       matrix:
         jdk: [17]
-        platform: ["ubuntu-latest", "windows-latest"]
+        platform: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
 
     steps:
@@ -149,7 +148,7 @@ jobs:
       fail-fast: false
       matrix:
         jdk: [11, 17]
-        platform: ["ubuntu-latest", "windows-latest"]
+        platform: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
 
     steps:

diff --git a/build.gradle b/build.gradle
@@ -107,6 +107,14 @@ tasks.whenTaskAdded {task ->
 }
 
 def splitTestConfig = [
+    crossClusterTest: [
+        description: "Runs cross-cluster tests.",
+        filters: [
+            includeTestsMatching: [
+                    "org.opensearch.security.ccstest.*"
+            ]
+        ]
+    ],
     dlicDlsflsTest: [
         description: "Runs Document- and Field-Level Security tests.",
         filters: [
@@ -123,26 +131,18 @@ def splitTestConfig = [
             ]
         ]
     ],
-    crossClusterTest: [
-        description: "Runs cross-cluster tests.",
-        filters: [
-            includeTestsMatching: [
-                    "org.opensearch.security.ccstest.*"
-            ]
-        ]
-    ],
-    sslTest: [
-        description: "Runs most of the SSL tests.",
+    indicesTest: [
+        description: "Runs indices tests from all classes.",
         filters: [
             includeTestsMatching: [
-                "org.opensearch.security.ssl.*"
+                "org.opensearch.security.*indices*"
             ],
             excludeTestsMatching: [
-                "org.opensearch.security.ssl.OpenSSL*"
+                "org.opensearch.security.sanity.tests.*"
             ]
         ]
     ],
-    opensslCiTest: [
+    opensslCITest: [
         description: "Runs portion of SSL tests related to OpenSSL. Explained in https://github.com/opensearch-project/security/pull/2301",
         include: '**/OpenSSL*.class'
     ],
@@ -157,14 +157,14 @@ def splitTestConfig = [
             ]
         ]
     ],
-    indicesTest: [
-        description: "Runs indices tests from all classes.",
+    sslTest: [
+        description: "Runs most of the SSL tests.",
         filters: [
             includeTestsMatching: [
-                "org.opensearch.security.*indices*"
+                "org.opensearch.security.ssl.*"
             ],
             excludeTestsMatching: [
-                "org.opensearch.security.sanity.tests.*"
+                "org.opensearch.security.ssl.OpenSSL*"
             ]
         ]
     ]