test

datastax · Jul 22, 2024 · 4520738 · 4520738
1 parent a34c6ea
commit 4520738
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ds-collector-tests/cluster-vanilla-ssh-docker.make b/ds-collector-tests/cluster-vanilla-ssh-docker.make
@@ -42,6 +42,8 @@ ${TESTS_DOCKER}: test_docker_%:
 
 setup:
 	mkdir -p /tmp/datastax && rm -fr /tmp/datastax/* ../ds-collector.TEST-cluster-vanilla-ssh-docker-*.tar.gz TEST-cluster-vanilla-ssh-docker-*_secret.key
+	docker run --rm --privileged multiarch/qemu-user-static:register
+	apt-get install -y qemu binfmt-support qemu-user-static
 	# make diagnostics bundle
 	cd ../ ; ISSUE="TEST-cluster-vanilla-ssh-docker-$$(git rev-parse --abbrev-ref HEAD)--$$(git rev-parse --short HEAD)" make
 	tar -xvf ../ds-collector.TEST-cluster-vanilla-ssh-docker-*.tar.gz

diff --git a/ds-collector-tests/integration-bastion.docker b/ds-collector-tests/integration-bastion.docker
@@ -1,7 +1,7 @@
 FROM ubuntu:latest
 
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y openssh-server locales sshpass procps ethtool netcat-traditional net-tools sysstat pciutils ntp ntpstat numactl lvm2 curl xxd qemu binfmt-support qemu-user-static
+RUN apt-get update && apt-get install -y openssh-server locales sshpass procps ethtool netcat-traditional net-tools sysstat pciutils ntp ntpstat numactl lvm2 curl xxd
 
 
 RUN mkdir /var/run/sshd