From 74634546960b574cd1805373a503ebd0d4b2b6c3 Mon Sep 17 00:00:00 2001
From: mck <mck@apache.org>
Date: Fri, 2 Aug 2024 17:36:55 +0200
Subject: [PATCH] SQUASH

---
 .github/workflows/ds-collector-ci.yml              | 2 ++
 ds-collector-tests/cluster-vanilla-ssh-docker.make | 1 +
 ds-collector-tests/docker-compose.yml              | 6 ------
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ds-collector-ci.yml b/.github/workflows/ds-collector-ci.yml
index db92e1d..018bf6a 100644
--- a/.github/workflows/ds-collector-ci.yml
+++ b/.github/workflows/ds-collector-ci.yml
@@ -26,6 +26,8 @@ jobs:
       working-directory: ds-collector-tests
       run: |
         sudo apt-get install -y  binfmt-support qemu qemu-user-static
+        sudo curl -L "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+        sudo chmod uga+x /usr/local/bin/docker-compose
         echo "Testing ds-collector"
         make -f cluster-vanilla-ssh-docker.make
 
diff --git a/ds-collector-tests/cluster-vanilla-ssh-docker.make b/ds-collector-tests/cluster-vanilla-ssh-docker.make
index 15b1241..fb5848a 100755
--- a/ds-collector-tests/cluster-vanilla-ssh-docker.make
+++ b/ds-collector-tests/cluster-vanilla-ssh-docker.make
@@ -40,6 +40,7 @@ ${TESTS_DOCKER}: test_docker_%:
 	./collector/ds-collector -X -f $* -n ds-collector-tests_cassandra-00_1
 	# test archives exist
 	if ! ls /tmp/datastax/ | grep -q ".tar.gz" ; then echo "Failed to generate artefacts in the docker cluster " ; ls -l /tmp/datastax/ ; exit 1 ; fi
+	for f in $(ls /tmp/datastax/*.tar.gz) ; do if ! tar -xf $f ; then echo "Failed to untar artefact $f in the ssh cluster " ; exit 1 ; fi ; done
 	
 
 setup:
diff --git a/ds-collector-tests/docker-compose.yml b/ds-collector-tests/docker-compose.yml
index 1a52150..e766d0a 100644
--- a/ds-collector-tests/docker-compose.yml
+++ b/ds-collector-tests/docker-compose.yml
@@ -20,9 +20,6 @@ services:
         retries: 60
 
   cassandra-01:
-    build:
-        context: .
-        dockerfile: integration-cassandra.docker
     image: ds-collector:integration-cassandra
     container_name: ds-collector-tests_cassandra-01_1
     depends_on:
@@ -43,9 +40,6 @@ services:
         retries: 60
 
   cassandra-02:
-    build:
-       context: .
-       dockerfile: integration-cassandra.docker
     image: ds-collector:integration-cassandra
     container_name: ds-collector-tests_cassandra-02_1
     depends_on: