From 3fb3bf85744abda0fc8f725264cc137b6868e282 Mon Sep 17 00:00:00 2001 From: Costin Lupu Date: Thu, 23 Nov 2023 11:55:20 +0100 Subject: [PATCH 1/2] run_tests.sh: Load vsock_loopback module for vsock-proxy tests The `connection_test` test runs the vsock-proxy on the parent instance for testing the connection between a server and a client on the same instance, in which case the vsock loopback must be enabled on the parent instance. Signed-off-by: Costin Lupu --- run_tests.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/run_tests.sh b/run_tests.sh index 83e88dea..ffea5e22 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -109,6 +109,11 @@ sed -i 's/CMD/ENTRYPOINT/g' examples/"${ARCH}"/hello-entrypoint/Dockerfile || te nitro-cli build-enclave --docker-dir examples/"${ARCH}"/hello-entrypoint --docker-uri hello-entrypoint-usage \ --output-file test_images/hello-entrypoint-usage.eif || test_failed +# Load vsock_loopback module for connection_test test of vsock-proxy +if [ "$(lsmod | grep -cw vsock_loopback)" -eq 0 ]; then + modprobe vsock_loopback || echo "Module vsock_loopback not available." +fi + # Run all unit tests while IFS= read -r test_line do From 84f1a415e206b3e9b4c7788e7fb9aeaa9b461cf3 Mon Sep 17 00:00:00 2001 From: Costin Lupu Date: Thu, 23 Nov 2023 13:18:23 +0100 Subject: [PATCH 2/2] Set new Github token Signed-off-by: Costin Lupu --- ci_entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_entrypoint.sh b/ci_entrypoint.sh index 241b9cae..0dda67dd 100755 --- a/ci_entrypoint.sh +++ b/ci_entrypoint.sh @@ -36,7 +36,7 @@ ARCH=$(uname -m) PR_NUMBER=$(echo "$CODEBUILD_SOURCE_VERSION" | cut -d"/" -f2) LOGS_PATH="tests_results/${PR_NUMBER}/ci_logs_${CODEBUILD_RESOLVED_SOURCE_VERSION}_${ARCH}.txt" LOGS_URL="https://console.aws.amazon.com/s3/object/aws-nitro-enclaves-cli/${LOGS_PATH}" -ACCESS_TOKEN=$(aws ssm get-parameter --name GITHUB_TOKEN --region us-east-1 | jq -r .Parameter.Value) +ACCESS_TOKEN=$(aws ssm get-parameter --name GITHUB_TOKEN_LVPV --region us-east-1 | jq -r .Parameter.Value) if [[ $ACCESS_TOKEN == "" ]]; then echo "Invalid ACCESS_TOKEN"