From f891d0bee65367995a4d2a4591e83d7161b110f9 Mon Sep 17 00:00:00 2001 From: Timofei Larkin Date: Tue, 24 Jun 2025 17:47:11 +0300 Subject: [PATCH] Add exec bit to script, sanitize image list Signed-off-by: Timofei Larkin --- hack/list-images.sh | 6 ++++-- packages/core/testing/Makefile | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) mode change 100644 => 100755 hack/list-images.sh diff --git a/hack/list-images.sh b/hack/list-images.sh old mode 100644 new mode 100755 index 3a29300d..efb772f9 --- a/hack/list-images.sh +++ b/hack/list-images.sh @@ -1,6 +1,8 @@ #!/bin/sh for node in 11 12 13; do - talosctl -n 192.168.123.${node} -e 192.168.123.${node} images ls >> ./hosttmp/images-${SANDBOX_NAME}.txt - talosctl -n 192.168.123.${node} -e 192.168.123.${node} images --namespace system ls >> ./hosttmp/images-${SANDBOX_NAME}.txt + talosctl -n 192.168.123.${node} -e 192.168.123.${node} images ls >> /workspace/images.tmp + talosctl -n 192.168.123.${node} -e 192.168.123.${node} images --namespace system ls >> /workspace/images.tmp done + +while read _ name sha _ ; do echo $sha $name ; done < /workspace/images.tmp | sort -u > /workspace/images.txt diff --git a/packages/core/testing/Makefile b/packages/core/testing/Makefile index 40906caf..ec3b0179 100755 --- a/packages/core/testing/Makefile +++ b/packages/core/testing/Makefile @@ -69,10 +69,10 @@ apply: delete -e TALOSCONFIG=/workspace/talosconfig \ -e KUBECONFIG=/workspace/kubeconfig \ -e SANDBOX_NAME=${SANDBOX_NAME} \ - -v /tmp:/workspace/hosttmp \ "$$(yq .e2e.image values.yaml)" \ --timeout 30m docker cp "${ROOT_DIR}/." "${SANDBOX_NAME}":/workspace list-images: docker exec "${SANDBOX_NAME}" sh -c 'cd /workspace && hack/list-images.sh' + docker cp "${SANDBOX_NAME}":/workspace/images.txt ../../../images.txt