From 3bf43098863aa1cd603cb3c8c9b3e63a507eb5e1 Mon Sep 17 00:00:00 2001 From: mck Date: Mon, 22 Jul 2024 11:04:29 +0200 Subject: [PATCH] test --- .github/workflows/ds-collector-ci.yml | 3 +++ ds-collector-tests/cluster-dse-k8s.make | 1 - ds-collector-tests/cluster-one-node-vanilla-ssh-docker.make | 1 - ds-collector-tests/cluster-vanilla-k8s.make | 1 - ds-collector-tests/cluster-vanilla-ssh-docker.make | 1 - ds-collector-tests/integration-bastion.docker | 2 +- ds-collector/rust-commands/README.md | 2 -- 7 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ds-collector-ci.yml b/.github/workflows/ds-collector-ci.yml index 891c098..a7861f6 100644 --- a/.github/workflows/ds-collector-ci.yml +++ b/.github/workflows/ds-collector-ci.yml @@ -25,6 +25,7 @@ jobs: - name: Test ds-collector working-directory: ds-collector-tests run: | + sudo apt-get install -y qemu binfmt-support qemu-user-static echo "Testing ds-collector" make -f cluster-vanilla-ssh-docker.make @@ -59,6 +60,7 @@ jobs: - name: Test ds-collector working-directory: ds-collector-tests run: | + sudo apt-get install -y qemu binfmt-support qemu-user-static echo "Testing ds-collector" make -f cluster-vanilla-k8s.make @@ -75,6 +77,7 @@ jobs: - name: Test ds-collector working-directory: ds-collector-tests run: | + sudo apt-get install -y qemu binfmt-support qemu-user-static echo "Testing ds-collector" make -f cluster-dse-k8s.make diff --git a/ds-collector-tests/cluster-dse-k8s.make b/ds-collector-tests/cluster-dse-k8s.make index 1ed16af..011652f 100755 --- a/ds-collector-tests/cluster-dse-k8s.make +++ b/ds-collector-tests/cluster-dse-k8s.make @@ -30,7 +30,6 @@ setup: tar -xvf ../ds-collector.TEST-cluster-dse-k8s-*.tar.gz rm collector/collector.conf cp TEST-cluster-dse-k8s-*_secret.key collector/ || true - test -f collector/collect-info # setup k8s cluster cp k8s-manifests/01-kind-config.yaml /tmp/datastax/01-kind-config.yaml kind create cluster --name ds-collector-cluster-dse-k8s --config /tmp/datastax/01-kind-config.yaml diff --git a/ds-collector-tests/cluster-one-node-vanilla-ssh-docker.make b/ds-collector-tests/cluster-one-node-vanilla-ssh-docker.make index 4f47cea..6850b55 100755 --- a/ds-collector-tests/cluster-one-node-vanilla-ssh-docker.make +++ b/ds-collector-tests/cluster-one-node-vanilla-ssh-docker.make @@ -47,7 +47,6 @@ setup: tar -xvf ../ds-collector.TEST-cluster-one-node-vanilla-ssh-docker-*.tar.gz rm collector/collector.conf cp TEST-cluster-one-node-vanilla-ssh-docker-*_secret.key collector/ || true - test -f collector/collect-info # setup single node docker cluster and bastion docker-compose up --build -d cassandra-00 bastion docker-compose ps diff --git a/ds-collector-tests/cluster-vanilla-k8s.make b/ds-collector-tests/cluster-vanilla-k8s.make index 44d0550..7d44e8c 100755 --- a/ds-collector-tests/cluster-vanilla-k8s.make +++ b/ds-collector-tests/cluster-vanilla-k8s.make @@ -27,7 +27,6 @@ setup: tar -xvf ../ds-collector.TEST-cluster-vanilla-k8s-*.tar.gz rm collector/collector.conf cp TEST-cluster-vanilla-k8s-*_secret.key collector/ || true - test -f collector/collect-info # setup k8s cluster cp k8s-manifests/01-kind-config.yaml /tmp/datastax/01-kind-config.yaml kind create cluster --name ds-collector-cluster-vanilla-k8s --config /tmp/datastax/01-kind-config.yaml diff --git a/ds-collector-tests/cluster-vanilla-ssh-docker.make b/ds-collector-tests/cluster-vanilla-ssh-docker.make index ac8bad3..7aa1d3f 100755 --- a/ds-collector-tests/cluster-vanilla-ssh-docker.make +++ b/ds-collector-tests/cluster-vanilla-ssh-docker.make @@ -47,7 +47,6 @@ setup: tar -xvf ../ds-collector.TEST-cluster-vanilla-ssh-docker-*.tar.gz rm collector/collector.conf cp TEST-cluster-vanilla-ssh-docker-*_secret.key collector/ || true - test -f collector/collect-info # setup docker cluster and bastion docker-compose up --build -d docker-compose ps diff --git a/ds-collector-tests/integration-bastion.docker b/ds-collector-tests/integration-bastion.docker index 929dab4..d68cabb 100644 --- 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 diff --git a/ds-collector/rust-commands/README.md b/ds-collector/rust-commands/README.md index 060ea44..4a710d4 100644 --- a/ds-collector/rust-commands/README.md +++ b/ds-collector/rust-commands/README.md @@ -14,8 +14,6 @@ On Mac aarch: On Linux: - docker run --rm --privileged multiarch/qemu-user-static:register - sudo apt-get install -y qemu binfmt-support qemu-user-static docker run --platform linux/arm64 -v /usr/bin/qemu-aarch64-static:/usr/bin/qemu-aarch64-static -v $PWD:/volume -w /volume -t clux/muslrust rustc --target aarch64-unknown-linux-musl *.rs