a

JanusGraph · Aug 30, 2023 · ad9c56e · ad9c56e
1 parent a8261d7
commit ad9c56e
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 20 deletions.
diff --git a/.github/workflows/ci-backend-cql-dummy.yml b/.github/workflows/ci-backend-cql-dummy.yml
@@ -17,12 +17,12 @@ name: CI Backend CQL
 on:
   pull_request:
     paths:
-    - 'docs/**'
-    - '.github/workflows/ci-docs.yml'
-    - '.github/ISSUE_TEMPLATE/**'
-    - 'requirements.txt'
-    - 'docs.Dockerfile'
-    - '*.md'
+      - 'docs/**'
+      - '.github/workflows/ci-docs.yml'
+      - '.github/ISSUE_TEMPLATE/**'
+      - 'requirements.txt'
+      - 'docs.Dockerfile'
+      - '*.md'
 
 jobs:
   tests:
@@ -82,5 +82,41 @@ jobs:
             args: "-Pscylladb -Dtest=\"**/core/cql/*\""
             name: scylladb-core
             java: 17
+          - module: cql
+            args: "-Pcassandra4-byteordered -Dtest=\"**/diskstorage/cql/*\""
+            name: byteordered-diskstorage
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-murmur -Dtest=\"**/diskstorage/cql/*\""
+            name: murmur-diskstorage
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-byteordered -Dtest=\"**/graphdb/cql/*\""
+            name: byteordered-graphdb
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-murmur -Dtest=\"**/graphdb/cql/*\""
+            name: murmur-graphdb
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-murmur -Dtest=\"**/hadoop/*\""
+            name: murmur-hadoop
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-byteordered -Dtest=\"**/core/cql/*\""
+            name: byteordered-core
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-murmur -Dtest=\"**/core/cql/*\""
+            name: murmur-core
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
+            name: murmur-ssl
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
+            name: murmur-client-auth
+            java: 17
     steps:
       - run: 'echo "No build required"'
diff --git a/.github/workflows/ci-backend-cql.yml b/.github/workflows/ci-backend-cql.yml
@@ -17,20 +17,20 @@ name: CI Backend CQL
 on:
   pull_request:
     paths-ignore:
-    - 'docs/**'
-    - '.github/workflows/ci-docs.yml'
-    - '.github/ISSUE_TEMPLATE/**'
-    - 'requirements.txt'
-    - 'docs.Dockerfile'
-    - '*.md'
+      - 'docs/**'
+      - '.github/workflows/ci-docs.yml'
+      - '.github/ISSUE_TEMPLATE/**'
+      - 'requirements.txt'
+      - 'docs.Dockerfile'
+      - '*.md'
   push:
     paths-ignore:
-    - 'docs/**'
-    - '.github/workflows/ci-docs.yml'
-    - '.github/ISSUE_TEMPLATE/**'
-    - 'requirements.txt'
-    - 'docs.Dockerfile'
-    - '*.md'
+      - 'docs/**'
+      - '.github/workflows/ci-docs.yml'
+      - '.github/ISSUE_TEMPLATE/**'
+      - 'requirements.txt'
+      - 'docs.Dockerfile'
+      - '*.md'
     branches-ignore:
       - 'dependabot/**'
 
@@ -51,7 +51,7 @@ jobs:
             ${{ runner.os }}-maven-
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 8
           distribution: zulu
       - run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }}
       - run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }}
@@ -115,6 +115,42 @@ jobs:
             args: "-Pscylladb -Dtest=\"**/core/cql/*\""
             name: scylladb-core
             java: 17
+          - module: cql
+            args: "-Pcassandra4-byteordered -Dtest=\"**/diskstorage/cql/*\""
+            name: byteordered-diskstorage
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-murmur -Dtest=\"**/diskstorage/cql/*\""
+            name: murmur-diskstorage
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-byteordered -Dtest=\"**/graphdb/cql/*\""
+            name: byteordered-graphdb
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-murmur -Dtest=\"**/graphdb/cql/*\""
+            name: murmur-graphdb
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-murmur -Dtest=\"**/hadoop/*\""
+            name: murmur-hadoop
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-byteordered -Dtest=\"**/core/cql/*\""
+            name: byteordered-core
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-murmur -Dtest=\"**/core/cql/*\""
+            name: murmur-core
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
+            name: murmur-ssl
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
+            name: murmur-client-auth
+            java: 17
     steps:
       - uses: actions/checkout@v3
         with:
@@ -176,7 +212,7 @@ jobs:
             ${{ runner.os }}-maven-
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 8
           distribution: zulu
       - run: mvn clean install --projects janusgraph-${{ matrix.module }} ${{ env.BUILD_MAVEN_OPTS }} ${{ matrix.install-args }}
       - run: mvn verify --projects janusgraph-${{ matrix.module }} -Dcassandra.docker.version='3.0.18' ${{ env.VERIFY_MAVEN_OPTS }} ${{ matrix.args }}
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
@@ -108,6 +108,12 @@ jobs:
           - module: cql
             args: "-Pcassandra3-murmur -Dtest.skip.tp=false -DskipTests=true"
             java: 17
+          - module: cql
+            args: "-Pcassandra4-byteordered -Dtest.skip.tp=false -DskipTests=true"
+            java: 17
+          - module: cql
+            args: "-Pcassandra4-murmur -Dtest.skip.tp=false -DskipTests=true"
+            java: 17
           - module: hbase
             args: "-Dtest.skip.tp=false -DskipTests=true"
             java: 17