Skip to content

Commit 2af9324

Browse files
build(python): enable flakybot on library unit and system tests (#75)
Source-Author: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Source-Date: Wed Feb 17 14:10:46 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: d17674372e27fb8f23013935e794aa37502071aa Source-Link: googleapis/synthtool@d176743
1 parent d59cce2 commit 2af9324

File tree

4 files changed

+30
-5
lines changed

4 files changed

+30
-5
lines changed

packages/google-cloud-container/.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ docs.metadata
5050

5151
# Virtual environment
5252
env/
53+
54+
# Test logs
5355
coverage.xml
54-
sponge_log.xml
56+
*sponge_log.xml
5557

5658
# System test environment variables.
5759
system_tests/local_test_setup

packages/google-cloud-container/.kokoro/build.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,16 @@ python3 -m pip uninstall --yes --quiet nox-automation
4040
python3 -m pip install --upgrade --quiet nox
4141
python3 -m nox --version
4242

43+
# If this is a continuous build, send the test log to the FlakyBot.
44+
# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
45+
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then
46+
cleanup() {
47+
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
48+
$KOKORO_GFILE_DIR/linux_amd64/flakybot
49+
}
50+
trap cleanup EXIT HUP
51+
fi
52+
4353
# If NOX_SESSION is set, it only runs the specified session,
4454
# otherwise run all the sessions.
4555
if [[ -n "${NOX_SESSION:-}" ]]; then

packages/google-cloud-container/noxfile.py

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ def default(session):
9393
session.run(
9494
"py.test",
9595
"--quiet",
96+
f"--junitxml=unit_{session.python}_sponge_log.xml",
9697
"--cov=google/cloud",
9798
"--cov=tests/unit",
9899
"--cov-append",
@@ -141,9 +142,21 @@ def system(session):
141142

142143
# Run py.test against the system tests.
143144
if system_test_exists:
144-
session.run("py.test", "--quiet", system_test_path, *session.posargs)
145+
session.run(
146+
"py.test",
147+
"--quiet",
148+
f"--junitxml=system_{session.python}_sponge_log.xml",
149+
system_test_path,
150+
*session.posargs,
151+
)
145152
if system_test_folder_exists:
146-
session.run("py.test", "--quiet", system_test_folder_path, *session.posargs)
153+
session.run(
154+
"py.test",
155+
"--quiet",
156+
f"--junitxml=system_{session.python}_sponge_log.xml",
157+
system_test_folder_path,
158+
*session.posargs,
159+
)
147160

148161

149162
@nox.session(python=DEFAULT_PYTHON_VERSION)

packages/google-cloud-container/synth.metadata

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"git": {
55
"name": ".",
66
"remote": "https://github.com/googleapis/python-container.git",
7-
"sha": "a9aa69705440915c2f2aff20c2722bd596b8e7ec"
7+
"sha": "7ed5e591e9a4a9a58dc1340bbe40dcc986feca7f"
88
}
99
},
1010
{
@@ -19,7 +19,7 @@
1919
"git": {
2020
"name": "synthtool",
2121
"remote": "https://github.com/googleapis/synthtool.git",
22-
"sha": "4679e7e415221f03ff2a71e3ffad75b9ec41d87e"
22+
"sha": "d17674372e27fb8f23013935e794aa37502071aa"
2323
}
2424
}
2525
],

0 commit comments

Comments
 (0)