From 25fbe8f1b65c7f73b4343441c945db408bd0711c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Leszczy=C5=84ski?= <2000michal@wp.pl>
Date: Fri, 22 Dec 2023 19:58:55 +0100
Subject: [PATCH] add(testing): test against enterprise Scylla

Also, add timeout on first node setup, as misconfiguration could lead to hanging at this step.
---
 testing/.env                |  2 --
 testing/docker-compose.yaml | 18 +++++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/testing/.env b/testing/.env
index 4dca3c7029..9f953fa407 100644
--- 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
index 9692e33b9a..7a68385c2c 100644
--- 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"