Skip to content

Commit afd5520

Browse files
Fixed broken //tests/docker/util:all tests (#1817)
* Fix broken `//tests/docker/util:all` tests * just revert the breaking reordering change Co-authored-by: Alex Eagle <alexeagle@google.com>
1 parent 0adf8b2 commit afd5520

2 files changed

Lines changed: 3 additions & 9 deletions

File tree

.bazelci/presubmit.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,6 @@ platforms:
205205
- "..."
206206
# tests/docker/security require gcloud setup to access asci-toolchains images
207207
- "-//tests/docker/security/..."
208-
# Failing with
209-
# Unable to load docker image from bazel-out/k8-fastbuild/bin/tests/docker/util/test_container_commit.build: archive/tar: invalid tar header
210-
# TODO(alexeagle): re-enable after investigating
211-
- "-//tests/docker/util:all"
212208
# contrib targets are not compatible with remote exec
213209
- "-//tests/contrib:derivative_with_volume_repro_test"
214210
- "-//tests/contrib:random_file_img_non_repro_test"
@@ -231,10 +227,6 @@ platforms:
231227
- "//tests/..."
232228
# tests/docker/security require gcloud setup to access asci-toolchains images
233229
- "-//tests/docker/security/..."
234-
# Failing with
235-
# Unable to load docker image from bazel-out/k8-fastbuild/bin/tests/docker/util/test_container_commit.build: archive/tar: invalid tar header
236-
# TODO(alexeagle): re-enable after investigating
237-
- "-//tests/docker/util:all"
238230
# contrib tests are not compatible with remote exec
239231
- "-//tests/contrib:derivative_with_volume_repro_test"
240232
- "-//tests/contrib:random_file_img_non_repro_test"

docker/util/run.bzl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,11 @@ _commit_attrs = {
266266
allow_files = True,
267267
),
268268
}
269+
270+
# @unsorted-dict-items
269271
_commit_outputs = {
270-
"build": "%{name}.build",
271272
"out": "%{name}_commit.tar",
273+
"build": "%{name}.build",
272274
}
273275

274276
container_run_and_commit = rule(

0 commit comments

Comments
 (0)