From b3714c1409998aedb0324acc8d36a75abff456a1 Mon Sep 17 00:00:00 2001 From: Albrecht Lohofener Date: Sat, 9 Nov 2024 23:05:05 +0100 Subject: [PATCH] Fix githash in Docker image tag agin. --- .github/workflows/openwrt-stable-build.yml | 2 +- test/tests/openwrt_docker_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/openwrt-stable-build.yml b/.github/workflows/openwrt-stable-build.yml index 4a60071..0a2b01f 100644 --- a/.github/workflows/openwrt-stable-build.yml +++ b/.github/workflows/openwrt-stable-build.yml @@ -330,6 +330,6 @@ jobs: GIT_HASH=`git rev-parse --short HEAD` docker buildx imagetools create \ - --tag albrechtloh/openwrt-docker:openwrt-${{ env.OPENWRT_VERSION }}-${{ env.GIT_HASH }} \ + --tag albrechtloh/openwrt-docker:openwrt-${{ env.OPENWRT_VERSION }}-$GIT_HASH \ --tag albrechtloh/openwrt-docker:latest \ albrechtloh/openwrt-docker:ci-openwrt-stable diff --git a/test/tests/openwrt_docker_test.py b/test/tests/openwrt_docker_test.py index ec93643..6704586 100644 --- a/test/tests/openwrt_docker_test.py +++ b/test/tests/openwrt_docker_test.py @@ -94,7 +94,7 @@ def run_openwrt_shell_command(command, *arg): pid = ret['return']['pid'] # Get stdout of process - time.sleep(5) # Give command 5 seconds time to respond. It would be better to implement a real timeout here but I need to got he bed :-( + time.sleep(5) # Give command 5 seconds time to respond. It would be better to implement a real timeout. # Call qemu guest tools function 'guest-exec-status'. This is only working if OpenWrt is booted and the qemu guest tools are running process = subprocess.run(['docker','exec','openwrt','sh','-c',r"""echo -ne '{"execute":"guest-exec-status", "arguments": { "pid": """ + str(pid) + r"""}}' | nc -w 1 -U /run/qga.sock"""], stdout=subprocess.PIPE,