add(testing): test against enterprise Scylla

Also, add timeout on first node setup, as misconfiguration could lead to hanging at this step.
scylladb · Feb 22, 2024 · 25fbe8f · 25fbe8f
1 parent 2825354
commit 25fbe8f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/testing/.env b/testing/.env
@@ -1,7 +1,5 @@
 COMPOSE_PROJECT_NAME="scylla_manager"
 
-SCYLLA_IMAGE=scylladb/scylla
-
 SSL_AUTHORITY_CRT=scylla/certs/ca.crt
 SSL_CLIENT_KEY=scylla/certs/cl.key
 SSL_CLIENT_CRT=scylla/certs/cl.crt

diff --git a/testing/docker-compose.yaml b/testing/docker-compose.yaml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   dc1_node_1:
-    image: scylladb/scylla-agent:${SCYLLA_VERSION}
+    image: scylladb/agent-${SCYLLA_VERSION}
     privileged: true
     volumes:
       - type: bind
@@ -22,7 +22,7 @@ services:
       second:
 
   dc1_node_2:
-    image: scylladb/scylla-agent:${SCYLLA_VERSION}
+    image: scylladb/agent-${SCYLLA_VERSION}
     privileged: true
     volumes:
       - type: bind
@@ -42,7 +42,7 @@ services:
       second:
 
   dc1_node_3:
-    image: scylladb/scylla-agent:${SCYLLA_VERSION}
+    image: scylladb/agent-${SCYLLA_VERSION}
     privileged: true
     volumes:
       - type: bind
@@ -62,7 +62,7 @@ services:
       second:
 
   dc2_node_1:
-    image: scylladb/scylla-agent:${SCYLLA_VERSION}
+    image: scylladb/agent-${SCYLLA_VERSION}
     privileged: true
     volumes:
       - type: bind
@@ -82,7 +82,7 @@ services:
       second:
 
   dc2_node_2:
-    image: scylladb/scylla-agent:${SCYLLA_VERSION}
+    image: scylladb/agent-${SCYLLA_VERSION}
     privileged: true
     volumes:
       - type: bind
@@ -102,7 +102,7 @@ services:
       second:
 
   dc2_node_3:
-    image: scylladb/scylla-agent:${SCYLLA_VERSION}
+    image: scylladb/agent-${SCYLLA_VERSION}
     privileged: true
     volumes:
       - type: bind
@@ -122,7 +122,7 @@ services:
       second:
 
   second_cluster_dc1_node_1:
-    image: scylladb/scylla-agent:${SCYLLA_VERSION}
+    image: scylladb/agent-${SCYLLA_VERSION}
     privileged: true
     volumes:
       - type: bind
@@ -142,7 +142,7 @@ services:
       second:
 
   second_cluster_dc1_node_2:
-    image: scylladb/scylla-agent:${SCYLLA_VERSION}
+    image: scylladb/agent-${SCYLLA_VERSION}
     privileged: true
     volumes:
       - type: bind
@@ -162,7 +162,7 @@ services:
       second:
 
   scylla-manager-db:
-    image: ${SCYLLA_IMAGE}:${SCYLLA_VERSION}
+    image: scylladb/${SCYLLA_VERSION}
     ports:
       - "9042:9042"
       - "10000:10000"