[8.0.0] Backport of a few CI fixes for 8.0.0 (#24269)

- 7ee3e9c
- f6585d4
- 5b54c74
- be2186f
- 968bc96

.bazelci/postsubmit.yml

@@ -200,7 +200,10 @@ tasks:
       - "//src:test_repos"
     test_flags:
       - "--config=ci-macos"
-      - "--noremote_accept_cached"
+      # Fine tune the number of test jobs running in parallel to avoid timeout
+      - "--local_test_jobs=2"
+      # Increase the test timeout by 20% to avoid flaky test failures due to timeout
+      - "--test_timeout=72,360,1080,4320"
     test_targets:
       - "//scripts/..."
       - "//src/main/starlark/tests/builtins_bzl/..."

.bazelci/presubmit.yml

@@ -177,6 +177,7 @@ tasks:
       # Disable python and shell integration tests on Intel Macs
       - "-//src/test/shell/..."
       - "-//src/test/py/..."
+      - "-//src/main/starlark/tests/builtins_bzl:cc_builtin_tests"
       # https://github.com/bazelbuild/bazel/issues/17410
       - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
       # Disable android tests since we are moving Android rules out of the Bazel repo.
@@ -201,6 +202,10 @@ tasks:
       - "//src:test_repos"
     test_flags:
       - "--config=ci-macos"
+      # Fine tune the number of test jobs running in parallel to avoid timeout
+      - "--local_test_jobs=2"
+      # Increase the test timeout by 20% to avoid flaky test failures due to timeout
+      - "--test_timeout=72,360,1080,4320"
     test_targets:
       - "//scripts/..."
       - "//src/main/starlark/tests/builtins_bzl/..."

src/test/py/bazel/bzlmod/bazel_overrides_test.py

@@ -400,7 +400,7 @@ def testCmdAbsoluteModuleOverride(self):
             'bazel_dep(name = "ss", version = "1.0")',
             'local_path_override(',
             '  module_name = "ss",',
-            '  path = "%s",' % self.Path('aa'),
+            '  path = "%s",' % self.Path('aa').replace('\\', '/'),
             ')',
         ],
     )

tools/build_defs/pkg/path_test.py

@@ -13,12 +13,16 @@
 # limitations under the License.
 """Testing for helper functions."""
 
-import imp
+import importlib.machinery
+import importlib.util
 import unittest
 
-pkg_bzl = imp.load_source(
-    'pkg_bzl',
-    'tools/build_defs/pkg/path.bzl')
+
+loader = importlib.machinery.SourceFileLoader(
+    'pkg_bzl', 'tools/build_defs/pkg/path.bzl')
+spec = importlib.util.spec_from_loader(loader.name, loader)
+pkg_bzl = importlib.util.module_from_spec(spec)
+loader.exec_module(pkg_bzl)
 
 
 class File(object):