WIP

Author: tengu-alt

.github/workflows/main.yml

@@ -3,7 +3,7 @@ name: Build
 on:
   push:
     branches:
-      - master
+      - ci-integration-tests-simplify
   pull_request:
     types: [ opened, synchronize, reopened ]
 
@@ -118,21 +118,8 @@ jobs:
           name: ccm-cluster-cassandra-${{ matrix.cassandra_version }}-go-${{ matrix.go }}-tag-${{ matrix.tags }}
           path: /home/runner/.ccm/test
           retention-days: 5
-  integration-auth-cassandra:
-    timeout-minutes: 15
-    needs:
-      - build
-    name: Integration Tests with auth
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        go: [ '1.22', '1.23' ]
-        cassandra_version: [ '4.0.13' ]
-        compressor: [ "snappy" ]
-        tags: [ "integration" ]
-
-    steps:
+      - name: Delete cluster
+        run: ccm remove
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
@@ -159,7 +146,7 @@ jobs:
               "authorizer: CassandraAuthorizer"
               "enable_user_defined_functions: true"
           )
-
+          
           if [[ $VERSION == 3.*.* ]]; then
               conf+=(
                 "rpc_server_type: sync"
@@ -179,27 +166,112 @@ jobs:
                 "materialized_views_enabled: true"
               )
           fi
-
+          
           ccm remove test || true
-
+          
           ccm create test -v $VERSION -n 1 -d --vnodes --jvm_arg="-Xmx256m -XX:NewSize=100m"
           ccm updateconf "${conf[@]}"
-
+          
           rm -rf $HOME/.ccm/test/node1/data/system_auth
-
+          
           export JVM_EXTRA_OPTS=" -Dcassandra.test.fail_writes_ks=test -Dcassandra.custom_query_handler_class=org.apache.cassandra.cql3.CustomPayloadMirroringQueryHandler"
-
+          
           ccm start --wait-for-binary-proto --verbose
           ccm status
           ccm node1 nodetool status
-
+          
           args="-gocql.timeout=60s -runssl -proto=4 -rf=3 -clusterSize=1 -autowait=2000ms -compressor=${{ matrix.compressor }} -gocql.cversion=$VERSION -cluster=$(ccm liveset) ./..."
-
+          
           echo "args=$args" >> $GITHUB_ENV
           echo "JVM_EXTRA_OPTS=$JVM_EXTRA_OPTS" >> $GITHUB_ENV
           sleep 30s
       - name: Integration tests
         run: |
           source ~/venv/bin/activate
           export JVM_EXTRA_OPTS="${{env.JVM_EXTRA_OPTS}}"
-          go test -v -run=TestAuthentication -tags "${{ matrix.tags }} gocql_debug" -timeout=15s -runauth ${{ env.args }}
+          go test -v -run=TestAuthentication -tags "${{ matrix.tags }} gocql_debug" -timeout=15s -runauth ${{ env.args }
+#  integration-auth-cassandra:
+#    timeout-minutes: 15
+#    needs:
+#      - build
+#    name: Integration Tests with auth
+#    runs-on: ubuntu-latest
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        go: [ '1.22', '1.23' ]
+#        cassandra_version: [ '4.0.13' ]
+#        compressor: [ "snappy" ]
+#        tags: [ "integration" ]
+#
+#    steps:
+#      - uses: actions/checkout@v3
+#      - uses: actions/setup-go@v4
+#        with:
+#          go-version: ${{ matrix.go }}
+#      - name: Setup environment
+#        uses: ./.github/actions/setup-environment
+#      - name: Start cassandra nodes
+#        run: |
+#          source ~/venv/bin/activate
+#          VERSION=${{ matrix.cassandra_version }}
+#          keypath="$(pwd)/testdata/pki"
+#          conf=(
+#              "client_encryption_options.enabled: true"
+#              "client_encryption_options.keystore: $keypath/.keystore"
+#              "client_encryption_options.keystore_password: cassandra"
+#              "client_encryption_options.require_client_auth: true"
+#              "client_encryption_options.truststore: $keypath/.truststore"
+#              "client_encryption_options.truststore_password: cassandra"
+#              "concurrent_reads: 2"
+#              "concurrent_writes: 2"
+#              "write_request_timeout_in_ms: 5000"
+#              "read_request_timeout_in_ms: 5000"
+#              "authenticator: PasswordAuthenticator"
+#              "authorizer: CassandraAuthorizer"
+#              "enable_user_defined_functions: true"
+#          )
+#
+#          if [[ $VERSION == 3.*.* ]]; then
+#              conf+=(
+#                "rpc_server_type: sync"
+#                "rpc_min_threads: 2"
+#                "rpc_max_threads: 2"
+#                "enable_user_defined_functions: true"
+#                "enable_materialized_views: true"
+#              )
+#          elif [[ $VERSION == 4.0.* ]]; then
+#              conf+=(
+#                "enable_user_defined_functions: true"
+#                "enable_materialized_views: true"
+#              )
+#          else
+#              conf+=(
+#                "user_defined_functions_enabled: true"
+#                "materialized_views_enabled: true"
+#              )
+#          fi
+#
+#          ccm remove test || true
+#
+#          ccm create test -v $VERSION -n 1 -d --vnodes --jvm_arg="-Xmx256m -XX:NewSize=100m"
+#          ccm updateconf "${conf[@]}"
+#
+#          rm -rf $HOME/.ccm/test/node1/data/system_auth
+#
+#          export JVM_EXTRA_OPTS=" -Dcassandra.test.fail_writes_ks=test -Dcassandra.custom_query_handler_class=org.apache.cassandra.cql3.CustomPayloadMirroringQueryHandler"
+#
+#          ccm start --wait-for-binary-proto --verbose
+#          ccm status
+#          ccm node1 nodetool status
+#
+#          args="-gocql.timeout=60s -runssl -proto=4 -rf=3 -clusterSize=1 -autowait=2000ms -compressor=${{ matrix.compressor }} -gocql.cversion=$VERSION -cluster=$(ccm liveset) ./..."
+#
+#          echo "args=$args" >> $GITHUB_ENV
+#          echo "JVM_EXTRA_OPTS=$JVM_EXTRA_OPTS" >> $GITHUB_ENV
+#          sleep 30s
+#      - name: Integration tests
+#        run: |
+#          source ~/venv/bin/activate
+#          export JVM_EXTRA_OPTS="${{env.JVM_EXTRA_OPTS}}"
+#          go test -v -run=TestAuthentication -tags "${{ matrix.tags }} gocql_debug" -timeout=15s -runauth ${{ env.args }}