testing to fix ScyllaCloudConfigTests failing in CI

Author: fruch

ci/run_integration_test.sh

@@ -15,7 +15,7 @@ if (( aio_max_nr !=  aio_max_nr_recommended_value  )); then
    fi
 fi
 
-BRANCH='branch-5.0'
+SCYLLA_RELEASE='release:5.0'
 
 python3 -m venv .test-venv
 source .test-venv/bin/activate
@@ -32,27 +32,15 @@ pip install awscli
 pip install https://github.com/scylladb/scylla-ccm/archive/master.zip
 
 # download version
-LATEST_MASTER_JOB_ID=`aws --no-sign-request s3 ls downloads.scylladb.com/unstable/scylla/${BRANCH}/relocatable/ | tr -s ' ' | cut -d ' ' -f 3 | tr -d '\/'  | sort -g | tail -n 1`
-AWS_BASE=s3://downloads.scylladb.com/unstable/scylla/${BRANCH}/relocatable/${LATEST_MASTER_JOB_ID}
-
-aws s3 --no-sign-request cp ${AWS_BASE}/scylla-package.tar.gz . &
-aws s3 --no-sign-request cp ${AWS_BASE}/scylla-tools-package.tar.gz . &
-aws s3 --no-sign-request cp ${AWS_BASE}/scylla-jmx-package.tar.gz . &
-wait
-
-ccm create scylla-driver-temp -n 1 --scylla --version unstable/${BRANCH}:$LATEST_MASTER_JOB_ID \
- --scylla-core-package-uri=./scylla-package.tar.gz \
- --scylla-tools-java-package-uri=./scylla-tools-package.tar.gz \
- --scylla-jmx-package-uri=./scylla-jmx-package.tar.gz
 
+ccm create scylla-driver-temp -n 1 --scylla --version ${SCYLLA_RELEASE}
 ccm remove
 
 # run test
 
-echo "export SCYLLA_VERSION=unstable/${BRANCH}:${LATEST_MASTER_JOB_ID}"
+echo "export SCYLLA_VERSION=${SCYLLA_RELEASE}"
 echo "PROTOCOL_VERSION=4 EVENT_LOOP_MANAGER=asyncio pytest --import-mode append tests/integration/standard/"
-export SCYLLA_VERSION=unstable/${BRANCH}:${LATEST_MASTER_JOB_ID}
+export SCYLLA_VERSION=${SCYLLA_RELEASE}
 export MAPPED_SCYLLA_VERSION=3.11.4
-PROTOCOL_VERSION=4 EVENT_LOOP_MANAGER=asyncio pytest -rf --import-mode append $*
-
+PROTOCOL_VERSION=4 EVENT_LOOP_MANAGER=libev pytest -rf --import-mode append $*
 

tests/integration/standard/test_scylla_cloud.py

@@ -1,3 +1,4 @@
+import logging
 import os.path
 from unittest import TestCase
 from ccmlib.utils.ssl_utils import generate_ssl_stores
@@ -54,6 +55,7 @@ def test_1_node_cluster(self):
 
         for config in [config_path_yaml, config_data_yaml]:
             for connection_class in supported_connection_classes:
+                logging.warning('testing with class: %s', connection_class.__name__)
                 cluster = Cluster(scylla_cloud=config, connection_class=connection_class)
                 with cluster.connect() as session:
                     res = session.execute("SELECT * FROM system.local")
@@ -68,6 +70,7 @@ def test_3_node_cluster(self):
 
         for config in [config_path_yaml, config_data_yaml]:
             for connection_class in supported_connection_classes:
+                logging.warning('testing with class: %s', connection_class.__name__)
                 cluster = Cluster(scylla_cloud=config, connection_class=connection_class)
                 with cluster.connect() as session:
                     res = session.execute("SELECT * FROM system.local")