Unbreak Kokoro for TF-GNN: pin bazel to 7.4.1 (last before 8.0.0)

PiperOrigin-RevId: 716569867
tensorflow · Jan 17, 2025 · 7057885 · 7057885
1 parent 577d03f
commit 7057885
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 0 deletions.
diff --git a/kokoro/github/ubuntu/cpu/build.sh b/kokoro/github/ubuntu/cpu/build.sh
@@ -36,6 +36,12 @@ mkdir -p "$TEST_ROOT"
 ln -s "$(pwd)"/tensorflow_gnn "$TEST_ROOT"/tensorflow_gnn
 tag_filters="-no_oss,-oss_excluded"
 
+# Check that `bazel` does version selection as expected.
+if [[ -n "${USE_BAZEL_VERSION}" && $(bazel --version) != *${USE_BAZEL_VERSION}* ]]; then
+  echo "Mismatch of configured and actual bazel version (see logged [[ command)"
+  exit 1
+fi
+
 bazel clean
 pip install -r requirements-dev.txt --progress-bar off
 pip install tf-keras-nightly tf-nightly --progress-bar off --upgrade

diff --git a/kokoro/github/ubuntu/cpu/build_versioned.sh b/kokoro/github/ubuntu/cpu/build_versioned.sh
@@ -47,6 +47,12 @@ cat /etc/os-release
 # These tag filters are enforced to start with a comma for separation
 tag_filters="-no_oss,-oss_excluded${TAG_FILTERS}"
 
+# Check that `bazel` does version selection as expected.
+if [[ -n "${USE_BAZEL_VERSION}" && $(bazel --version) != *${USE_BAZEL_VERSION}* ]]; then
+  echo "Mismatch of configured and actual bazel version (see logged [[ command)"
+  exit 1
+fi
+
 bazel clean
 pip install -r requirements-dev.txt --progress-bar off
 pip install tensorflow=="${TF_VERSION}" --progress-bar off --upgrade

diff --git a/kokoro/github/ubuntu/cpu/continuous.cfg b/kokoro/github/ubuntu/cpu/continuous.cfg
@@ -1,5 +1,10 @@
 build_file: "gnn/kokoro/github/ubuntu/cpu/build.sh"
 
+env_vars: {
+  key: "USE_BAZEL_VERSION"
+  value: "7.4.1"  # TODO - b/390391579: Unpin once bazel 8 works.
+}
+
 action {
   define_artifacts {
     regex: "**/sponge_log.log"

diff --git a/kokoro/github/ubuntu/cpu/newest_stable/continuous.cfg b/kokoro/github/ubuntu/cpu/newest_stable/continuous.cfg
@@ -1,5 +1,9 @@
 build_file: "gnn/kokoro/github/ubuntu/cpu/build_versioned.sh"
 
+env_vars: {
+  key: "USE_BAZEL_VERSION"
+  value: "7.4.1"  # TODO - b/390391579: Unpin once bazel 8 works.
+}
 env_vars: {
   key: "PYTHON_VERSION"
   value: "3.11"

diff --git a/kokoro/github/ubuntu/cpu/newest_stable/presubmit.cfg b/kokoro/github/ubuntu/cpu/newest_stable/presubmit.cfg
@@ -1,5 +1,9 @@
 build_file: "gnn/kokoro/github/ubuntu/cpu/build_versioned.sh"
 
+env_vars: {
+  key: "USE_BAZEL_VERSION"
+  value: "7.4.1"  # TODO - b/390391579: Unpin once bazel 8 works.
+}
 env_vars: {
   key: "PYTHON_VERSION"
   value: "3.11"

diff --git a/kokoro/github/ubuntu/cpu/oldest/continuous.cfg b/kokoro/github/ubuntu/cpu/oldest/continuous.cfg
@@ -1,5 +1,9 @@
 build_file: "gnn/kokoro/github/ubuntu/cpu/build_versioned.sh"
 
+env_vars: {
+  key: "USE_BAZEL_VERSION"
+  value: "7.4.1"  # TODO - b/390391579: Unpin once bazel 8 works.
+}
 env_vars: {
   key: "PYTHON_VERSION"
   value: "3.9"

diff --git a/kokoro/github/ubuntu/cpu/oldest/presubmit.cfg b/kokoro/github/ubuntu/cpu/oldest/presubmit.cfg
@@ -1,5 +1,9 @@
 build_file: "gnn/kokoro/github/ubuntu/cpu/build_versioned.sh"
 
+env_vars: {
+  key: "USE_BAZEL_VERSION"
+  value: "7.4.1"  # TODO - b/390391579: Unpin once bazel 8 works.
+}
 env_vars: {
   key: "PYTHON_VERSION"
   value: "3.9"

diff --git a/kokoro/github/ubuntu/cpu/presubmit.cfg b/kokoro/github/ubuntu/cpu/presubmit.cfg
@@ -1,5 +1,10 @@
 build_file: "gnn/kokoro/github/ubuntu/cpu/build.sh"
 
+env_vars: {
+  key: "USE_BAZEL_VERSION"
+  value: "7.4.1"  # TODO - b/390391579: Unpin once bazel 8 works.
+}
+
 action {
   define_artifacts {
     regex: "**/sponge_log.log"

diff --git a/tensorflow_gnn/experimental/datasets/BUILD b/tensorflow_gnn/experimental/datasets/BUILD
@@ -26,6 +26,7 @@ py_strict_test(
     srcs = ["pyg_adapter_test.py"],
     python_version = "PY3",
     srcs_version = "PY3ONLY",
+    tags = ["no_oss"],  # Dependency conflict for numpy>=2.
     deps = [
         ":pyg_adapter",
         "//testing/pybase",