Do not run DSE scenario with java 11

thelastpickle · Oct 30, 2024 · 19c5bc1 · 19c5bc1
1 parent ddd6140
commit 19c5bc1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -94,7 +94,6 @@ jobs:
         exit $?
       
   integration-tests:
-    needs: build
     continue-on-error: ${{ matrix.experimental }}
     strategy:
         fail-fast: false
@@ -103,7 +102,7 @@ jobs:
           it-backend: [local, s3, gcs, minio, azure, azure-hierarchical]
           # IBM not included by default due to lite plan quota being easily exceeded
           #it-backend: [local, s3, gcs, minio, ibm, azure]
-          cassandra-version: [2.2.19, 3.11.11, 4.0.0, 'github:apache/trunk']
+          cassandra-version: [2.2.19, 3.11.11, 4.0.0, 'github:apache/trunk', 'dse']
           java-version: [8.0.252, 11.0.25]
           include:
             # tweak the experimental flag for cassandra versions
@@ -132,6 +131,8 @@ jobs:
               experimental: false
               java-version: 11.0.25
           exclude:
+            # no broad tests for DSE, we only run one case
+            - cassandra-version: 'dse'
             # no tests against trunk
             - cassandra-version: 'github:apache/trunk'
             # no tests for C* 2.2 with java 11
@@ -236,7 +237,7 @@ jobs:
         sed -i 's/#HEAP_NEWSIZE="800M"/HEAP_NEWSIZE="200M"/' ~/.ccm/test_cluster/node1/conf/cassandra-env.sh
         # remove the ThreadPriorityPolicy option for cases where we run with java 11
         sed -i 's/-XX:ThreadPriorityPolicy=42//' ~/.ccm/test_cluster/node1/conf/jvm.options || true
-        sed -i 's/-XX:ThreadPriorityPolicy=42//' ~/.ccm/test_cluster/node1/conf/jvm8-serve.options || true
+        sed -i 's/-XX:ThreadPriorityPolicy=42//' ~/.ccm/test_cluster/node1/conf/jvm8-server.options || true
         ccm start -v
         ccm showlastlog|tail -100
         ccm stop
@@ -297,11 +298,6 @@ jobs:
         mv tests/integration/.coverage .
         poetry run coverage xml
 
-    - name: Setup tmate session
-      if: ${{ failure() }}
-      uses: mxschmitt/action-tmate@v3
-      timeout-minutes: 15
-
     - uses: codecov/codecov-action@v1
       name: Report code coverage
 

diff --git a/run_integration_tests.sh b/run_integration_tests.sh
@@ -171,8 +171,14 @@ if [[ -z "$CASSANDRA_VERSION" ]]; then
    echo "Cassandra version is not set, using default."
    CASSANDRA_VERSION_FLAG=""
 else
-   echo "Cassandra version is set to ${CASSANDRA_VERSION}"
-   CASSANDRA_VERSION_FLAG="-D cassandra-version=${CASSANDRA_VERSION}"
+   if [ "$CASSANDRA_VERSION" == "dse" ]; then
+     echo "Cassandra version is set to DSE. Using C* 3.11.11 and enabling the DSE scenario."
+     CASSANDRA_VERSION_FLAG="-D cassandra-version=3.11.11"
+     STORAGE_TAGS="${STORAGE_TAGS},@dse"
+   else
+     echo "Cassandra version is set to ${CASSANDRA_VERSION}"
+     CASSANDRA_VERSION_FLAG="-D cassandra-version=${CASSANDRA_VERSION}"
+   fi
 fi
 
 if [ "$COVERAGE" == "yes" ]

diff --git a/tests/integration/features/integration_tests.feature b/tests/integration/features/integration_tests.feature
@@ -1096,16 +1096,13 @@ Feature: Integration tests
         Then I stop the DSE cluster
         And I delete the DSE cluster
 
-    @local
-    Examples: Local storage
+    @dse
+    Examples: DSE Scenario
     | storage    | client encryption |
     | local      | without_client_encryption |
-
-    @s3
-    Examples: S3 storage
-    | storage           | client encryption         |
     | s3_us_west_oregon | without_client_encryption |
 
+
     @30
     Scenario Outline: Create an differential backup, corrupt it, then fix by doing another backup, and verify it
         Given I have a fresh ccm cluster "<client encryption>" running named "scenario30"