From: Eric Ball <eball@linuxfoundation.org>
Date: Wed, 20 May 2020 00:38:18 +0000 (+0000)
Subject: Merge "Add templates for CXX projects using autotools"
X-Git-Tag: v0.54.0^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=89213a114af3775da43b5f97c3584db516d49987;hp=455c02c6e706a43fc57e816e69fe347dccae8648;p=releng%2Fglobal-jjb.git

Merge "Add templates for CXX projects using autotools"
---

diff --git a/releasenotes/notes/fix-rtd-trigger-build-34b35822e840dae7.yaml b/releasenotes/notes/fix-rtd-trigger-build-34b35822e840dae7.yaml
new file mode 100644
index 00000000..c9071d4e
--- /dev/null
+++ b/releasenotes/notes/fix-rtd-trigger-build-34b35822e840dae7.yaml
@@ -0,0 +1,12 @@
+---
+fixes:
+  - |
+    Echo error response from RTD without formatting.  The script
+    rtd-trigger-build.sh starts a build at ReadTheDocs and parses
+    the response, a small JSON like this:
+
+    {"build_triggered":false,"project":"unicorn","versions":[]}
+
+    This change drops the invocation of jq that attempts to pretty-print
+    the JSON to the log when the build is not triggered, because that
+    call was failing for inexplicable reasons.
diff --git a/shell/rtd-trigger-build.sh b/shell/rtd-trigger-build.sh
index d272c2d7..e0a6f002 100644
--- a/shell/rtd-trigger-build.sh
+++ b/shell/rtd-trigger-build.sh
@@ -8,9 +8,9 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
-# Call cURL to trigger a build in RTD via the Generic API
+# Calls cURL to trigger a build in RTD via the Generic API
 #
-# Paramters:
+# Parameters:
 #     RTD_BUILD_URL: The unique build URL for the project.
 #                    Check Admin > Integrations > Generic API incoming webhook.
 #
@@ -35,9 +35,10 @@ json=$(curl -X POST -d "branches=${GERRIT_BRANCH}" -d "token=$RTD_TOKEN" "$RTD_B
 build_triggered=$(echo "$json" | jq -r .build_triggered)
 
 if [ "$build_triggered" != "true" ]; then
-    echo "ERROR: Build was not triggered."
-    echo "$json" | jq -r
+    echo "ERROR: Build was not triggered, ReadTheDocs response follows:"
+    echo "$json"
     exit 1
 fi
 
 echo "Build triggered for $GERRIT_PROJECT in ReadTheDocs."
+echo "---> rtd-trigger-build.sh ends"