Check notarize-service curl RC and output failure response (#775)

* Enable eclipse-notarize.sh curl failure info Signed-off-by: Andrew Leonard <anleonar@redhat.com> * Enable eclipse-notarize.sh curl failure info Signed-off-by: Andrew Leonard <anleonar@redhat.com> --------- Signed-off-by: Andrew Leonard <anleonar@redhat.com>
adoptium · Nov 22, 2023 · 4dcfa70 · 4dcfa70
1 parent 0378c77
commit 4dcfa70
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/codesign/eclipse-notarize.sh b/codesign/eclipse-notarize.sh
@@ -14,19 +14,24 @@
 # limitations under the License.
 ################################################################################
 
-set -eu
-
 PKG="$1"
 PRIMARY_BUNDLE_ID="$2"
 
 echo "Notarizing $1, this can take a while! Updating status every minute..."
 
-RESPONSE=$(curl -s -X POST -F file=@${PKG} -F 'options={"primaryBundleId": "'${PRIMARY_BUNDLE_ID}'", "staple": true};type=application/json' https://cbi.eclipse.org/macos/xcrun/notarize)
+RESPONSE=$(curl -s -X POST -F file=@${PKG} -F 'options={"primaryBundleId": "'${PRIMARY_BUNDLE_ID}'", "staple": true};type=application/json' https://cbi.eclipse.org/macos/xcrun/notarize 2>&1)
+CURL_RC=$?
+if [ $CURL_RC -ne 0 ]; then
+    echo "Notarize service curl failed rc=$CURL_RC"
+    echo "$RESPONSE"
+    exit $CURL_RC
+fi
 
 UUID=$(echo $RESPONSE | grep -Po '"uuid"\s*:\s*"\K[^"]+')
 STATUS=$(echo $RESPONSE | grep -Po '"status"\s*:\s*"\K[^"]+')
 
 while [[ ${STATUS} == 'IN_PROGRESS' ]]; do
+    echo "Waiting for notarize service response..."
     sleep 1m
     RESPONSE=$(curl -s https://cbi.eclipse.org/macos/xcrun/${UUID}/status)
     STATUS=$(echo $RESPONSE | grep -Po '"status"\s*:\s*"\K[^"]+')
@@ -40,3 +45,9 @@ if [[ ${STATUS} != 'COMPLETE' ]]; then
 fi
 
 curl -o "$PKG" https://cbi.eclipse.org/macos/xcrun/${UUID}/download
+CURL_RC=$?
+if [ $CURL_RC -ne 0 ]; then
+    echo "curl download of notarized pkg failed, failed rc=$CURL_RC"
+    exit $CURL_RC
+fi
+