From c8cba4502daa35f54f0e4226dad29cb8da6fa37d Mon Sep 17 00:00:00 2001
From: Anton Belodedenko <2033996+ab77@users.noreply.github.com>
Date: Mon, 27 May 2024 13:34:07 -0700
Subject: [PATCH] debug release asset

---
 docker-compose.yml         |  1 -
 src/balena-tests/balena.sh | 11 +++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d77984273..044b353ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -302,7 +302,6 @@ services:
       DOCKER_HOST: docker:2376
       DOCKER_TLS_VERIFY: 'true'
       GUEST_IMAGE: /balena/balena.img
-      RELEASE_ASSETS_TEST: "true"
     volumes:
       - builder-certs-client:/docker-pki/client
       - certs-data:/certs
diff --git a/src/balena-tests/balena.sh b/src/balena-tests/balena.sh
index 4330287c5..bcbb932b0 100755
--- a/src/balena-tests/balena.sh
+++ b/src/balena-tests/balena.sh
@@ -3,7 +3,7 @@
 # shellcheck disable=SC2154,SC2034,SC1090
 set -ae
 
-curl_opts="--retry ${ATTEMPTS} --fail"
+curl_opts="--retry 3 --fail"
 if [[ $VERBOSE =~ on|On|Yes|yes|true|True ]]; then
     set -x
     curl_opts="${curl_opts} -v"
@@ -264,13 +264,12 @@ function upload_release_asset() {
 		local release_id
 		release_id=${1:-1}
 
-		response="$(curl ${curl_opts} "https://api.${DNS_TLD}/resin/release_asset" \
+		curl ${curl_opts} "https://api.${DNS_TLD}/resin/release_asset" \
 		  --header "Authorization: Bearer $(cat <~/.balena/token)" \
 		  --form 'asset=@logo.png' \
 		  --form "release=${release_id}" \
-		  --form "asset_key=logo-$((RANDOM)).png")" && echo "${response}" | jq -re
-
-		echo "${response}" | jq -re .asset.href \
+		  --form "asset_key=logo-$((RANDOM)).png" \
+		  | jq -re .asset.href \
 		  | xargs -sfivo "/tmp/logo-$((RANDOM)).png"
 	fi
 }
@@ -287,7 +286,6 @@ else
     TLD="${DNS_TLD}"
 fi
 
-ATTEMPTS=${ATTEMPTS:-3}
 BALENA_API_URL=${BALENA_API_URL:-https://api.balena-cloud.com}
 BALENARC_BALENA_URL="${DNS_TLD}"
 CERTS=${CERTS:-/certs}
@@ -297,6 +295,7 @@ GUEST_DISK_SIZE=${GUEST_DISK_SIZE:-8}
 GUEST_IMAGE=${GUEST_IMAGE:-/balena/balena.img}
 OS_VERSION="$(get_os_version)"
 TEST_FLEET=${TEST_FLEET:-test-fleet}
+RELEASE_ASSETS_TEST=${RELEASE_ASSETS_TEST:-true}
 
 [[ -f "$CONF" ]] && source "${CONF}"