From 9437413a242c561c06864f0a6a762664b737b87d Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Tue, 18 Jul 2023 16:01:57 +0200 Subject: [PATCH] ignore checks and fix some Signed-off-by: Mauro Morales --- .shellcheckrc | 4 +++- script/test.sh | 3 ++- tools-image/build-arm-image.sh | 2 +- tools-image/raw-images.sh | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.shellcheckrc b/.shellcheckrc index f282b9d..0547724 100644 --- a/.shellcheckrc +++ b/.shellcheckrc @@ -1,3 +1,5 @@ disable=SC2086 disable=SC2034 -disable=SC2046 \ No newline at end of file +disable=SC2046 +disable=SC2068 +disable=SC2154 diff --git a/script/test.sh b/script/test.sh index 6985134..555feed 100755 --- a/script/test.sh +++ b/script/test.sh @@ -26,7 +26,8 @@ set -e kubectl cluster-info --context kind-$CLUSTER_NAME echo "Sleep to give times to node to populate with all info" kubectl wait --for=condition=Ready node/$CLUSTER_NAME-control-plane -export EXTERNAL_IP=$(kubectl get nodes -o jsonpath='{.items[].status.addresses[?(@.type == "InternalIP")].address}') +EXTERNAL_IP=$(kubectl get nodes -o jsonpath='{.items[].status.addresses[?(@.type == "InternalIP")].address}') +export EXTERNAL_IP export BRIDGE_IP="172.18.0.1" kubectl get nodes -o wide cd $ROOT_DIR/tests && $GINKGO -r -v ./e2e \ No newline at end of file diff --git a/tools-image/build-arm-image.sh b/tools-image/build-arm-image.sh index e2de53e..9820458 100755 --- a/tools-image/build-arm-image.sh +++ b/tools-image/build-arm-image.sh @@ -367,8 +367,8 @@ fi # Prepare the image and copy over the files -export DRIVE DRIVE=$(losetup -f "${output_image}" --show) +export DRIVE if [ -z "${DRIVE}" ]; then echo "Cannot execute losetup for $output_image" exit 1 diff --git a/tools-image/raw-images.sh b/tools-image/raw-images.sh index a9fc391..47f613c 100755 --- a/tools-image/raw-images.sh +++ b/tools-image/raw-images.sh @@ -71,7 +71,7 @@ truncate -s "+$((1024*1024))" $OUT if [ -n "$EXTEND" ]; then echo "Extending image of $EXTEND MB" - truncate -s "+$(($EXTEND*1024*1024))" $OUT + truncate -s "+$((EXTEND*1024*1024))" $OUT fi # Create the partition table in $OUT (assumes sectors of 512 bytes)