Skip to content

Commit cae0831

Browse files
iancha1992fweikert
iancha1992
and
fweikert
authored
[8.3.0] Bazel CI: Stop building binaries on CentOS 7 (#26071)
Safe to submit once bazelbuild/continuous-integration#2286 has been merged. Progress towards bazelbuild/continuous-integration#2272 PiperOrigin-RevId: 755425618 Change-Id: I114e8b3cd88891d25843fcc32b90e9c64a615e3d Commit ff7a283, 498a0c8 --------- Co-authored-by: Googler <[email protected]>
1 parent ffddc93 commit cae0831

File tree

5 files changed

+33
-12
lines changed

5 files changed

+33
-12
lines changed

‎.bazelci/build_bazel_binaries.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
---
22
platforms:
3-
centos7:
3+
rockylinux8:
4+
build_targets:
5+
- "//src:bazel"
6+
- "//src:bazel_nojdk"
7+
build_flags:
8+
- "-c"
9+
- "opt"
10+
rockylinux8_arm64:
411
build_targets:
512
- "//src:bazel"
613
- "//src:bazel_nojdk"

‎.bazelci/postsubmit.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
tasks:
4-
centos7:
4+
rockylinux8:
55
shell_commands:
66
- rm -rf $HOME/bazeltest
77
- mkdir $HOME/bazeltest
@@ -19,8 +19,6 @@ tasks:
1919
- "//src/tools/execlog/..."
2020
test_flags:
2121
- "--config=ci-linux"
22-
# Override REMOTE_NETWORK_ADDRESS since bazel_sandboxing_networking_test doesn't work on this platform
23-
- "--test_env=REMOTE_NETWORK_ADDRESS="
2422
test_targets:
2523
- "//scripts/..."
2624
- "//src/java_tools/..."
@@ -35,7 +33,7 @@ tasks:
3533
- "//tools/compliance/..."
3634
- "//tools/python/..."
3735
- "//tools/bash/..."
38-
# These tests are not compatible with the gcov version of CentOS 7.
36+
# These tests are not compatible with the gcov version of Rocky Linux 8.
3937
- "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
4038
- "-//src/test/shell/bazel:bazel_coverage_cc_released_test_gcc"
4139
- "-//src/test/shell/bazel:bazel_coverage_cc_head_test_gcc"

‎.bazelci/presubmit.yml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
tasks:
4-
centos7:
4+
rockylinux8:
55
shards: 4
66
shell_commands:
77
- rm -rf $HOME/bazeltest
@@ -20,8 +20,6 @@ tasks:
2020
- "//src/tools/execlog/..."
2121
test_flags:
2222
- "--config=ci-linux"
23-
# Override REMOTE_NETWORK_ADDRESS since bazel_sandboxing_networking_test doesn't work on this platform
24-
- "--test_env=REMOTE_NETWORK_ADDRESS="
2523
test_targets:
2624
- "//scripts/..."
2725
- "//src/java_tools/..."
@@ -36,7 +34,7 @@ tasks:
3634
- "//tools/compliance/..."
3735
- "//tools/python/..."
3836
- "//tools/bash/..."
39-
# These tests are not compatible with the gcov version of CentOS 7.
37+
# These tests are not compatible with the gcov version of Rocky Linux 8.
4038
- "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
4139
- "-//src/test/shell/bazel:bazel_coverage_cc_released_test_gcc"
4240
- "-//src/test/shell/bazel:bazel_coverage_cc_head_test_gcc"
@@ -46,6 +44,24 @@ tasks:
4644
include_json_profile:
4745
- build
4846
- test
47+
rockylinux8_arm64:
48+
shell_commands:
49+
- rm -rf $HOME/bazeltest
50+
- mkdir $HOME/bazeltest
51+
build_flags:
52+
- "--config=ci-linux"
53+
build_targets:
54+
- "//:bazel-distfile.zip"
55+
- "//scripts/packages/debian:bazel-debian.deb"
56+
- "//scripts/packages:with-jdk/install.sh"
57+
- "//src:bazel"
58+
- "//src:bazel_jdk_minimal"
59+
- "//src:test_repos"
60+
- "//src/main/java/..."
61+
- "//src/tools/diskcache/..."
62+
- "//src/tools/execlog/..."
63+
include_json_profile:
64+
- build
4965
fedora39:
5066
shell_commands:
5167
- rm -rf $HOME/bazeltest

‎src/test/shell/bazel/bazel_example_test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ function test_native_python_with_zip() {
135135
|| fail "//examples/py_native:bin execution failed"
136136
expect_log "Fib(5) == 8"
137137
# Using python <zipfile> to run the python package
138-
python ./bazel-bin/examples/py_native/bin >& $TEST_log \
138+
python3 ./bazel-bin/examples/py_native/bin >& $TEST_log \
139139
|| fail "//examples/py_native:bin execution failed"
140140
expect_log "Fib(5) == 8"
141141
assert_test_ok //examples/py_native:test --build_python_zip

‎src/test/shell/bazel/bazel_sandboxing_networking_test.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function setup_network_tests() {
5555
local socket_dir
5656
socket_dir="$(mktemp -d /tmp/test.XXXXXX)" || fail "mktemp failed"
5757
local socket="${socket_dir}/socket"
58-
python $python_server --unix_socket="${socket}" always file_to_serve &
58+
python3 $python_server --unix_socket="${socket}" always file_to_serve &
5959
local pid="${!}"
6060

6161
trap "kill_nc || true; kill '${pid}' || true; rm -f '${socket}'; rmdir '${socket_dir}'" EXIT
@@ -79,7 +79,7 @@ genrule(
7979
genrule(
8080
name = "loopback",
8181
outs = [ "loopback.txt" ],
82-
cmd = "python $python_server always $(pwd)/file_to_serve >port.txt & "
82+
cmd = "python3 $python_server always $(pwd)/file_to_serve >port.txt & "
8383
+ "pid=\$\$!; "
8484
+ "while ! grep started port.txt; do sleep 1; done; "
8585
+ "port=\$\$(head -n 1 port.txt); "

0 commit comments

Comments
 (0)