chore(java): enable blunderbuss for samples and backoff retry for staging releases (#667)

yoshi-automation · web-flow · commit 0c306320f3d3 · 2020-11-26T12:45:57.000+11:00
* chore(java): retry staging portion of the release with backoff * chore(java): retry staging portion of the release with backoff * build: skip logging the retried command - it may contain secrets Source-Author: Jeff Ching <chingor@google.com> Source-Date: Thu Nov 19 12:24:02 2020 -0800 Source-Repo: googleapis/synthtool Source-Sha: 68742c6016bf0d16948a572633d17955a8737414 Source-Link: googleapis/synthtool@68742c6 * build(java): enable blunderbuss for samples Source-Author: Jeff Ching <chingor@google.com> Source-Date: Mon Nov 23 10:23:01 2020 -0800 Source-Repo: googleapis/synthtool Source-Sha: 943bb78606d035001123030067dffcc34f4645f2 Source-Link: googleapis/synthtool@943bb78
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
@@ -0,0 +1,7 @@
+# Configuration for the Blunderbuss GitHub app. For more info see
+# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss
+assign_prs_by:
+- labels:
+  - samples
+  to:
+  - googleapis/java-samples-reviewers
diff --git a/.kokoro/common.sh b/.kokoro/common.sh
@@ -25,7 +25,6 @@ function retry_with_backoff {
     
     # allow a failures to continue
     set +e
-    echo "${command}"
     ${command}
     exit_code=$?
 
diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
@@ -20,19 +20,22 @@ python3 -m pip install gcp-releasetool
 python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
 
 source $(dirname "$0")/common.sh
+source $(dirname "$0")/../common.sh
 MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml
 pushd $(dirname "$0")/../../
 
 setup_environment_secrets
 create_settings_xml_file "settings.xml"
 
-mvn clean install deploy -B \
-  --settings ${MAVEN_SETTINGS_FILE} \
-  -DskipTests=true \
-  -DperformRelease=true \
-  -Dgpg.executable=gpg \
-  -Dgpg.passphrase=${GPG_PASSPHRASE} \
-  -Dgpg.homedir=${GPG_HOMEDIR}
+# attempt to stage 3 times with exponential backoff (starting with 10 seconds)
+retry_with_backoff 3 10 \
+  mvn clean install deploy -B \
+    --settings ${MAVEN_SETTINGS_FILE} \
+    -DskipTests=true \
+    -DperformRelease=true \
+    -Dgpg.executable=gpg \
+    -Dgpg.passphrase=${GPG_PASSPHRASE} \
+    -Dgpg.homedir=${GPG_HOMEDIR}
 
 if [[ -n "${AUTORELEASE_PR}" ]]
 then
diff --git a/synth.metadata b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-spanner.git",
-        "sha": "0f9b7bdc81a4eeecf772022bcec585bd1630895b"
+        "sha": "907ae1ff2f5c0b60510c435f5ba270bd92827104"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "7fcc405a579d5d53a726ff3da1b7c8c08f0f2d58"
+        "sha": "943bb78606d035001123030067dffcc34f4645f2"
       }
     }
   ],
@@ -57,6 +57,7 @@
     ".github/ISSUE_TEMPLATE/feature_request.md",
     ".github/ISSUE_TEMPLATE/support_request.md",
     ".github/PULL_REQUEST_TEMPLATE.md",
+    ".github/blunderbuss.yml",
     ".github/generated-files-bot.yml",
     ".github/readme/synth.py",
     ".github/release-please.yml",

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"git": {`
`5`	`5`	`"name": ".",`
`6`	`6`	`"remote": "https://github.com/googleapis/java-spanner.git",`
`7`		`- "sha": "0f9b7bdc81a4eeecf772022bcec585bd1630895b"`
	`7`	`+ "sha": "907ae1ff2f5c0b60510c435f5ba270bd92827104"`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`{`
`@@ -19,7 +19,7 @@`
`19`	`19`	`"git": {`
`20`	`20`	`"name": "synthtool",`
`21`	`21`	`"remote": "https://github.com/googleapis/synthtool.git",`
`22`		`- "sha": "7fcc405a579d5d53a726ff3da1b7c8c08f0f2d58"`
	`22`	`+ "sha": "943bb78606d035001123030067dffcc34f4645f2"`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`],`
`@@ -57,6 +57,7 @@`
`57`	`57`	`".github/ISSUE_TEMPLATE/feature_request.md",`
`58`	`58`	`".github/ISSUE_TEMPLATE/support_request.md",`
`59`	`59`	`".github/PULL_REQUEST_TEMPLATE.md",`
	`60`	`+ ".github/blunderbuss.yml",`
`60`	`61`	`".github/generated-files-bot.yml",`
`61`	`62`	`".github/readme/synth.py",`
`62`	`63`	`".github/release-please.yml",`