Skip to content

Commit d584fa3

Browse files
authored
chore: stop skipping some tests on bazelci (#3889)
## PR Checklist Please check if your PR fulfills the following requirements: - [x] Tests for the changes have been added (for bug fixes / features) - [x] Docs have been added / updated (for bug fixes / features) ## PR Type What kind of change does this PR introduce? <!-- Please check the one that applies to this PR using "x". --> - [ ] Bugfix - [ ] Feature (please, look at the "Scope of the project" section in the README.md file) - [ ] Code style update (formatting, local variables) - [ ] Refactoring (no functional changes, no api changes) - [ ] Build related changes - [x] CI related changes - [ ] Documentation content changes - [ ] Other... Please describe: ## What is the current behavior? <!-- Please describe the current behavior that you are modifying, or link to a relevant issue. --> Issue Number: N/A ## What is the new behavior? ## Does this PR introduce a breaking change? - [ ] Yes - [x] No <!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. --> ## Other information
1 parent b19c329 commit d584fa3

File tree

3 files changed

+24
-37
lines changed

3 files changed

+24
-37
lines changed

.bazelci/presubmit.yml

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,43 +7,35 @@ buildifier:
77
# Keep this in sync with the list in .pre-commit-config.yaml
88
# https://github.com/bazelbuild/buildtools/issues/479 should fix this by giving us a config file
99
tasks:
10-
ubuntu1804:
11-
name: ubuntu1804
12-
platform: ubuntu1804
10+
ubuntu2204:
11+
name: ubuntu2204
12+
platform: ubuntu2204
1313
build_targets:
1414
- "//..."
15-
test_flags:
16-
- "--test_tag_filters=-skip-on-bazelci-ubuntu"
1715
test_targets:
1816
- "//..."
19-
ubuntu1804-headers:
20-
name: ubuntu1804-headers
21-
platform: ubuntu1804
17+
ubuntu2204-headers:
18+
name: ubuntu2204-headers
19+
platform: ubuntu2204
2220
working_directory: "e2e/headers"
2321
build_targets:
2422
- "//..."
25-
test_flags:
26-
- "--test_tag_filters=-skip-on-bazelci-ubuntu"
2723
test_targets:
2824
- "//..."
29-
ubuntu1804-smoke:
30-
name: ubuntu1804-smoke
31-
platform: ubuntu1804
25+
ubuntu2204-smoke:
26+
name: ubuntu2204-smoke
27+
platform: ubuntu2204
3228
working_directory: "e2e/smoke"
3329
build_targets:
3430
- "//..."
35-
test_flags:
36-
- "--test_tag_filters=-skip-on-bazelci-ubuntu"
3731
test_targets:
3832
- "//..."
39-
ubuntu1804-nodejs_host:
40-
name: ubuntu1804-nodejs_host
41-
platform: ubuntu1804
33+
ubuntu2204-nodejs_host:
34+
name: ubuntu2204-nodejs_host
35+
platform: ubuntu2204
4236
working_directory: "e2e/nodejs_host"
4337
build_targets:
4438
- "//..."
45-
test_flags:
46-
- "--test_tag_filters=-skip-on-bazelci-ubuntu"
4739
test_targets:
4840
- "//..."
4941
macos:
@@ -91,13 +83,11 @@ tasks:
9183
working_directory: "e2e/nodejs_host"
9284
build_targets:
9385
- "//..."
94-
test_flags:
95-
- "--test_tag_filters=-skip-on-bazelci-windows"
9686
test_targets:
9787
- "//..."
98-
rbe_ubuntu1604-smoke:
99-
name: rbe_ubuntu1604-smoke
100-
platform: rbe_ubuntu1604
88+
rbe_ubuntu2204-smoke:
89+
name: rbe_ubuntu2204-smoke
90+
platform: rbe_ubuntu2204
10191
working_directory: "e2e/smoke"
10292
build_targets:
10393
- "//..."

e2e/nodejs_host/BUILD.bazel

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,24 +48,21 @@
4848
"@%s//:node" % node_toolchain,
4949
"@bazel_tools//tools/bash/runfiles",
5050
],
51-
tags = tags,
5251
)
53-
for (node_toolchain, tool, tags) in [
52+
for (node_toolchain, tool) in [
5453
(
5554
"nodejs",
5655
"npm",
57-
["skip-on-bazelci-ubuntu"], # fails on Bazel CI Ubuntu on latest Node.js due to GLIBC version on runner: "GLIBC_2.28 not found" (https://buildkite.com/bazel/rules-nodejs-nodejs/builds/13451#018feffd-4878-46e4-8582-ae94648a2d74)
5856
),
5957
(
6058
"nodejs",
6159
"npx",
62-
["skip-on-bazelci-ubuntu"], # fails on Bazel CI Ubuntu on latest Node.js due to GLIBC version on runner: "GLIBC_2.28 not found" (https://buildkite.com/bazel/rules-nodejs-nodejs/builds/13451#018feffd-4878-46e4-8582-ae94648a2d74)
6360
),
64-
("node16", "npm", []),
65-
("node16", "npx", []),
66-
("node16_nvmrc", "npm", []),
67-
("node16_nvmrc", "npx", []),
68-
("node17_custom", "npm", []),
69-
("node17_custom", "npx", []),
61+
("node16", "npm"),
62+
("node16", "npx"),
63+
("node16_nvmrc", "npm"),
64+
("node16_nvmrc", "npx"),
65+
("node17_custom", "npm"),
66+
("node17_custom", "npx"),
7067
]
7168
]

e2e/smoke/WORKSPACE.bzlmod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ http_archive(
1414
load("@bazelci_rules//:rbe_repo.bzl", "rbe_preconfig")
1515

1616
# Creates toolchain configuration for remote execution with BuildKite CI
17-
# for rbe_ubuntu1604
17+
# for rbe_ubuntu2204
1818
rbe_preconfig(
1919
name = "buildkite_config",
20-
toolchain = "ubuntu1804-bazel-java11",
20+
toolchain = "ubuntu2204",
2121
)

0 commit comments

Comments
 (0)