build(java): use ENABLE_FLAKYBOT env variable (#501)

yoshi-automation · web-flow · commit 9a1f46ebc678 · 2021-08-16T09:47:56.000-04:00
Kokoro job config now supports both environment variables during this migration period. Source-Author: Jeff Ching <chingor@google.com> Source-Date: Thu Aug 12 10:10:27 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: ff01716e16d2c6e87eaf87197b753ac9fcbbed5d Source-Link: googleapis/synthtool@ff01716
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -115,7 +115,7 @@ fi
 # fix output location of logs
 bash .kokoro/coerce_logs.sh
 
-if [[ "${ENABLE_BUILD_COP}" == "true" ]]
+if [[ "${ENABLE_FLAKYBOT}" == "true" ]]
 then
     chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot
     ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/java-datastore
diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
@@ -22,7 +22,7 @@ env_vars: {
 }
 
 env_vars: {
-  key: "ENABLE_BUILD_COP"
+  key: "ENABLE_FLAKYBOT"
   value: "true"
 }
 
diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg
@@ -33,6 +33,6 @@ env_vars: {
 }
 
 env_vars: {
-  key: "ENABLE_BUILD_COP"
+  key: "ENABLE_FLAKYBOT"
   value: "true"
 }
diff --git a/synth.metadata b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "c5f227b3ba517dedc79d0a2ab5a36a4306aa83c6"
+        "sha": "67e1f0f1e48e5d45167cda3d53a8ae5f0597d712"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "1a2878d6909dd10ca4e3c1b5943d6622e996054e"
+        "sha": "ff01716e16d2c6e87eaf87197b753ac9fcbbed5d"
       }
     }
   ],

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ env_vars: {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`env_vars: {`
`25`		`- key: "ENABLE_BUILD_COP"`
	`25`	`+ key: "ENABLE_FLAKYBOT"`
`26`	`26`	`value: "true"`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ env_vars: {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`env_vars: {`
`36`		`- key: "ENABLE_BUILD_COP"`
	`36`	`+ key: "ENABLE_FLAKYBOT"`
`37`	`37`	`value: "true"`
`38`	`38`	`}`
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-datastore.git",`
`7`		`- "sha": "c5f227b3ba517dedc79d0a2ab5a36a4306aa83c6"`
	`7`	`+ "sha": "67e1f0f1e48e5d45167cda3d53a8ae5f0597d712"`
`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": "1a2878d6909dd10ca4e3c1b5943d6622e996054e"`
	`22`	`+ "sha": "ff01716e16d2c6e87eaf87197b753ac9fcbbed5d"`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`],`