From 239e902d0f1f517d2bba62fc80c01550248c3bfd Mon Sep 17 00:00:00 2001 From: Theo Brigitte Date: Fri, 22 Nov 2024 10:55:48 +0100 Subject: [PATCH 1/3] Add order script to compatibility tests --- test/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run.sh b/test/run.sh index abc2788..4c4b595 100755 --- a/test/run.sh +++ b/test/run.sh @@ -6,7 +6,7 @@ SCRIPT_DIR=$(cd $(dirname "${BASH_SOURCE}") && pwd -P) DISTRO="${1}" -scripts="check.sh;list.sh" +scripts="check.sh;list.sh;order.sh --dry-run" echo "> Building image for ${DISTRO}" docker build -t "${DISTRO}-test" -f "${SCRIPT_DIR}/Dockerfile.${DISTRO}" . From 435029a5695efaa12cc4dad93a143218940c1be4 Mon Sep 17 00:00:00 2001 From: Theo Brigitte Date: Fri, 22 Nov 2024 11:08:45 +0100 Subject: [PATCH 2/3] Fix order script to be compatible with curl below 8.3.0 --- bin/order.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/order.sh b/bin/order.sh index 6d35cdf..1df2926 100755 --- a/bin/order.sh +++ b/bin/order.sh @@ -74,8 +74,8 @@ request() { --header "Accept: application/json"\ --header "Content-Type: application/json" \ --data "${data}" \ - -w '\n%output{'$HTTP_CODE_FILE'}%{http_code}' \ - "$@" + -w '%{stderr}%{http_code}' \ + "$@" 2>$HTTP_CODE_FILE set +x http_code=$(cat "$HTTP_CODE_FILE") From 0ecc459aea7498c77aca9d4876bf4fb3fdfd826d Mon Sep 17 00:00:00 2001 From: Theo Brigitte Date: Fri, 22 Nov 2024 11:13:59 +0100 Subject: [PATCH 3/3] add requirement arguments to order script --- test/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run.sh b/test/run.sh index 4c4b595..69a77cf 100755 --- a/test/run.sh +++ b/test/run.sh @@ -6,7 +6,7 @@ SCRIPT_DIR=$(cd $(dirname "${BASH_SOURCE}") && pwd -P) DISTRO="${1}" -scripts="check.sh;list.sh;order.sh --dry-run" +scripts="check.sh;list.sh;order.sh --dry-run -i dedicated_datacenter=rbx -i region=europe" echo "> Building image for ${DISTRO}" docker build -t "${DISTRO}-test" -f "${SCRIPT_DIR}/Dockerfile.${DISTRO}" .