chore: tweak kokoro config (via synth) (#129)

yoshi-automation · web-flow · commit 84cfb979a6c5 · 2021-01-15T14:07:01.000-05:00
* chore(python): skip docfx in main presubmit * chore(python): skip docfx in main presubmit * fix: properly template the repo name Source-Author: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Source-Date: Fri Jan 8 10:32:13 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: fb53b6fb373b7c3edf4e55f3e8036bc6d73fa483 Source-Link: googleapis/synthtool@fb53b6f * chore: add missing quotation mark Source-Author: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Source-Date: Mon Jan 11 09:43:06 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: 16ec872dd898d7de6e1822badfac32484b5d9031 Source-Link: googleapis/synthtool@16ec872
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -15,7 +15,11 @@
 
 set -eo pipefail
 
-cd github/python-api-core
+if [[ -z "${PROJECT_ROOT:-}" ]]; then
+    PROJECT_ROOT="github/python-api-core"
+fi
+
+cd "${PROJECT_ROOT}"
 
 # Disable buffering, so that the logs stream through.
 export PYTHONUNBUFFERED=1
@@ -30,16 +34,16 @@ export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
 export PROJECT_ID=$(cat "${KOKORO_GFILE_DIR}/project-id.json")
 
 # Remove old nox
-python3.6 -m pip uninstall --yes --quiet nox-automation
+python3 -m pip uninstall --yes --quiet nox-automation
 
 # Install nox
-python3.6 -m pip install --upgrade --quiet nox
-python3.6 -m nox --version
+python3 -m pip install --upgrade --quiet nox
+python3 -m nox --version
 
 # If NOX_SESSION is set, it only runs the specified session,
 # otherwise run all the sessions.
 if [[ -n "${NOX_SESSION:-}" ]]; then
-    python3.6 -m nox -s "${NOX_SESSION:-}"
+    python3 -m nox -s ${NOX_SESSION:-}
 else
-    python3.6 -m nox
+    python3 -m nox
 fi
diff --git a/.kokoro/docs/docs-presubmit.cfg b/.kokoro/docs/docs-presubmit.cfg
@@ -15,3 +15,14 @@ env_vars: {
     key: "TRAMPOLINE_IMAGE_UPLOAD"
     value: "false"
 }
+
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/python-api-core/.kokoro/build.sh"
+}
+
+# Only run this nox session.
+env_vars: {
+    key: "NOX_SESSION"
+    value: "docs docfx"
+}
diff --git a/.trampolinerc b/.trampolinerc
@@ -18,12 +18,14 @@
 required_envvars+=(
     "STAGING_BUCKET"
     "V2_STAGING_BUCKET"
+    "NOX_SESSION"
 )
 
 # Add env vars which are passed down into the container here.
 pass_down_envvars+=(
     "STAGING_BUCKET"
     "V2_STAGING_BUCKET"
+    "NOX_SESSION"
 )
 
 # Prevent unintentional override on the default image.
diff --git a/synth.metadata b/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/python-api-core.git",
-        "sha": "b51b7f587042fe9340371c1b5c8e9adf8001c43a"
+        "sha": "abc3d88466a1e55cf459e6c78a6fb7343a29df6f"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "41a4e56982620d3edcf110d76f4fcdfdec471ac8"
+        "sha": "16ec872dd898d7de6e1822badfac32484b5d9031"
       }
     }
   ],

Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,14 @@`
`18`	`18`	`required_envvars+=(`
`19`	`19`	`"STAGING_BUCKET"`
`20`	`20`	`"V2_STAGING_BUCKET"`
	`21`	`+ "NOX_SESSION"`
`21`	`22`	`)`
`22`	`23`
`23`	`24`	`# Add env vars which are passed down into the container here.`
`24`	`25`	`pass_down_envvars+=(`
`25`	`26`	`"STAGING_BUCKET"`
`26`	`27`	`"V2_STAGING_BUCKET"`
	`28`	`+ "NOX_SESSION"`
`27`	`29`	`)`
`28`	`30`
`29`	`31`	`# Prevent unintentional override on the default image.`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@`
`4`	`4`	`"git": {`
`5`	`5`	`"name": ".",`
`6`	`6`	`"remote": "https://github.com/googleapis/python-api-core.git",`
`7`		`- "sha": "b51b7f587042fe9340371c1b5c8e9adf8001c43a"`
	`7`	`+ "sha": "abc3d88466a1e55cf459e6c78a6fb7343a29df6f"`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`"git": {`
`12`	`12`	`"name": "synthtool",`
`13`	`13`	`"remote": "https://github.com/googleapis/synthtool.git",`
`14`		`- "sha": "41a4e56982620d3edcf110d76f4fcdfdec471ac8"`
	`14`	`+ "sha": "16ec872dd898d7de6e1822badfac32484b5d9031"`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`],`