Skip to content

Commit

Permalink
Change Python kokoro configs to test only their specified version.
Browse files Browse the repository at this point in the history
Using non-versioned `build_file` values means every Python version is tested
(under Tox), and this is multiplied by each Python version running Tox.

For example, this means that when the `python38` config is used to run Tox, the
Tox layer runs on Python 3.8, and which then tests all of the Python versions
individually. As a result, tests are run under Python 3.8 for every runner
configuration.

This change fixes the `build_file` paths to point to the correct paths.
  • Loading branch information
dlj-NaN committed Sep 29, 2020
1 parent 3d8943f commit 2f55e25
Show file tree
Hide file tree
Showing 20 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion kokoro/linux/python27/continuous.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python/build.sh"
build_file: "protobuf/kokoro/linux/python27/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python27/presubmit.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python/build.sh"
build_file: "protobuf/kokoro/linux/python27/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python27_cpp/continuous.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python_cpp/build.sh"
build_file: "protobuf/kokoro/linux/python27_cpp/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python27_cpp/presubmit.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python_cpp/build.sh"
build_file: "protobuf/kokoro/linux/python27_cpp/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python35/continuous.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python/build.sh"
build_file: "protobuf/kokoro/linux/python35/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python35/presubmit.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python/build.sh"
build_file: "protobuf/kokoro/linux/python35/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python35_cpp/continuous.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python_cpp/build.sh"
build_file: "protobuf/kokoro/linux/python35_cpp/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python35_cpp/presubmit.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python_cpp/build.sh"
build_file: "protobuf/kokoro/linux/python35_cpp/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python36/continuous.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python/build.sh"
build_file: "protobuf/kokoro/linux/python36/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python36/presubmit.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python/build.sh"
build_file: "protobuf/kokoro/linux/python36/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python36_cpp/continuous.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python_cpp/build.sh"
build_file: "protobuf/kokoro/linux/python36_cpp/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python36_cpp/presubmit.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python_cpp/build.sh"
build_file: "protobuf/kokoro/linux/python36_cpp/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python37/continuous.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python/build.sh"
build_file: "protobuf/kokoro/linux/python37/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python37/presubmit.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python/build.sh"
build_file: "protobuf/kokoro/linux/python37/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python37_cpp/continuous.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python_cpp/build.sh"
build_file: "protobuf/kokoro/linux/python37_cpp/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python37_cpp/presubmit.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python_cpp/build.sh"
build_file: "protobuf/kokoro/linux/python37_cpp/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python38/continuous.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python/build.sh"
build_file: "protobuf/kokoro/linux/python38/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python38/presubmit.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python/build.sh"
build_file: "protobuf/kokoro/linux/python38/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python38_cpp/continuous.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python_cpp/build.sh"
build_file: "protobuf/kokoro/linux/python38_cpp/build.sh"
timeout_mins: 120

action {
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/python38_cpp/presubmit.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Config file for running tests in Kokoro

# Location of the build script in repository
build_file: "protobuf/kokoro/linux/python_cpp/build.sh"
build_file: "protobuf/kokoro/linux/python38_cpp/build.sh"
timeout_mins: 120

action {
Expand Down

0 comments on commit 2f55e25

Please sign in to comment.