Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .bcr/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ bcr_test_module:
name: "Run test module"
bazel: ${{ bazel }}
platform: ${{ platform }}
test_flags:
- "--test_tag_filters=-requires-docker"
test_targets:
- "//..."
2 changes: 1 addition & 1 deletion apt/extensions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ def _distroless_extension(mctx):
)

# Key every package by the architecture we are resolving for, not by the
# package's own `Architecture` field.
# package's own `Architecture` field.
# For arch-specific packages these are the same.
# For `Architecture: all` packages this "expands" them into one entry per target architecture,
# so each carries its own arch-specific dependency closure instead of a single frozen one shared across arches.
Expand Down
1 change: 0 additions & 1 deletion apt/tests/deb_postfix_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ load("//distroless/tests:asserts.bzl", "assert_tar_listing")

_TEST_SUITE_PREFIX = "deb_postfix/"


def deb_postfix_tests():
native.genrule(
name = "_deb_postfix_mergedusr_data",
Expand Down
1 change: 0 additions & 1 deletion apt/tests/dpkg_status_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ load("//distroless/tests:asserts.bzl", "assert_tar_listing")

_TEST_SUITE_PREFIX = "dpkg_status/"


def dpkg_status_tests():
# Test with single control archive
native.genrule(
Expand Down
1 change: 0 additions & 1 deletion apt/tests/dpkg_statusd_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ load("//distroless/tests:asserts.bzl", "assert_tar_listing")

_TEST_SUITE_PREFIX = "dpkg_statusd/"


def dpkg_statusd_tests():
# Test basic dpkg_statusd with single package
native.genrule(
Expand Down
1 change: 0 additions & 1 deletion distroless/tests/flatten_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ load("//distroless/tests:asserts.bzl", "assert_tar_listing")

_TEST_SUITE_PREFIX = "flatten/"


def flatten_tests():
# Test flattening two simple tar archives
native.genrule(
Expand Down
1 change: 0 additions & 1 deletion distroless/tests/locale_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ load("//distroless/tests:asserts.bzl", "assert_tar_listing")

_TEST_SUITE_PREFIX = "locale/"


def locale_tests():
# Test basic locale extraction
native.genrule(
Expand Down
14 changes: 13 additions & 1 deletion e2e/smoke/BUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
load("@bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@container_structure_test//:defs.bzl", "container_structure_test")
load("@rules_distroless//distroless:defs.bzl", "cacerts", "group", "passwd")
load("@rules_oci//oci:defs.bzl", "oci_image", "oci_load")
Expand Down Expand Up @@ -121,12 +122,23 @@ oci_load(
target_compatible_with = COMPATIBLE_WITH,
)

build_test(
name = "smoke_build_test",
targets = [
":image_platform",
":tarball",
],
)

container_structure_test(
name = "test",
name = "structure_test",
configs = select({
"@platforms//cpu:arm64": ["test_linux_arm64.yaml"],
"@platforms//cpu:x86_64": ["test_linux_amd64.yaml"],
}),
image = ":image_platform",
tags = [
"requires-docker",
],
target_compatible_with = COMPATIBLE_WITH,
)