Skip to content

Commit

Permalink
make it easier to update image_test hashes
Browse files Browse the repository at this point in the history
We had to do this recently with bazelbuild#2098.  This is also useful for organisations that link against different zlib implementations (namely zlib-ng). This change makes it possible to easily swap out the hashes without modifying the test code.
  • Loading branch information
zevdg committed Aug 23, 2022
1 parent 94a7ddb commit e07807d
Show file tree
Hide file tree
Showing 47 changed files with 118 additions and 90 deletions.
5 changes: 5 additions & 0 deletions testdata/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -1102,3 +1102,8 @@ bzl_library(
srcs = ["utils.bzl"],
visibility = ["//visibility:private"],
)

filegroup(
name = "goldens",
srcs = glob(["goldens/**"]),
)
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_base_with_entrypoint
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:b8460d575a3d4558057bbdb6f05988259b4f61b1b1f3f117b941043e486914a2
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_build_with_tag
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:388ccb8b26078eb6dc12e4204e93835fe1886033b1848a964abb71d3c4acb890
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_bundle-gae-base
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:9117535b880556343e328aa20a08a8a2161173371c0e587ce4c7d3a9a4d1d12e
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_bundle-pause
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:0643112fd89f93bac6f39cd43f789aadfafae888199010af134f80de581d62ef
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_bundle-stamped
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:4e1eef44f9c6deb8e83494a8a815d7f88ed0a411499e8e166942ac3f8930ec8a
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_bundle-ubuntu
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:b8460d575a3d4558057bbdb6f05988259b4f61b1b1f3f117b941043e486914a2
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_dashdash_entrypoint
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:921b63580668951c8d1444cd419eecaf64b4a86c86de9a8f657f863201d15962
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_data_path-absolute
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:f2aff195a73deb3eff246f1b97a46ef8b634ca89e2b88a43cc000db745460bef
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_data_path-root
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
replace-me
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_data_path-with
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:c1eca42703357ed58c72bc726450d55ec5d1f1220089a9e447c3ad5b5f1e8356
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_data_path-without
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:d6ea07a7074a7c9cb29c98a064dd900e6f90e7be0628d71c8da509dee419220c
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_derivative_with_cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:a861490554b3658254af83568adfc83992dc796dbc425fb6f0db35cef2e216ee
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_derivative_with_volume
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:f6c5b0e90cd0f22581669e0b4efd2b530c746bf50b9a8945c584456eafc0ffb6
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_directory_with_tar_base
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:8fccb0a6c600b88fe117c81e368d62ad558b945cff8927110afed9f4072d2483
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_docker_tarball_base
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:67c9957f23377c8902412429c02c006a8a55fffaa6f44a9963a08aa1986abf01
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_dummy_repository
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:501c30ee6cb53cedc90d6b050e65bb44fd3fc81d25f0e868f95fedd31f32b097
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_files_base
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:84a3ebbfae2f49509b76c0beb3414b10fdd1bb0ceeed457754a3e44a251ed019
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:828eb1d0daa2f797497ec54de421e79a663429e0e791b246c420e84ec171fe7f
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_files_with_file_base
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:6793f8771bd38ebed45f5a4516fb67ada632d06b2fc0179e95e01847448c8386
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_files_with_tar_base
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:3ce522f4f9f80249eb75b9b7083a24b17f45c607a40f3d54418c6bad355b399f
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:c0d4751af7d72f7ce80e3997dadfad4f176823743e1b0a5af147d55f70a0c8d5
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_layers_with_env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:200f73a0fcbe4f58beb411bd3f649ed1fc847e14353f1ec832ed377c17ffd2fb
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_pause_based
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:29ce23be35b02e583cd4b5836024b6cb4e942a8e5e09671de97ae33ed4f06fb9
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_pause_piecemeal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:ca362da80137d6e22de45cac9705271c694e63d87d4f98f1485288e83bda7334
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_pause_piecemeal_gz
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:ca362da80137d6e22de45cac9705271c694e63d87d4f98f1485288e83bda7334
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_tar_base
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:1f952b078e8d380fce4097857f32823976203ed4aaa54821773474f98012bfac
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_tar_with_files_base
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:c1d46001de2e021dcc6943351cc62d1f236c6a3528132ca9014c28dc5bb19d02
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_tar_with_mtimes_preserved
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:8167d35b2267136fbb68f92b68fef2893000d74f372d4b694d6b53ca79a20146
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_tar_with_tar_base
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:3bb6c0ebe52f6f4a76562eee9d79c4c46ff9d9dad749ef55f949d089f7a36b0a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:accf4062e218d20cdcc661dcd5d4ff4f4818d5bc8641db1ed00c884d46ec6999
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_with_double_env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:0643112fd89f93bac6f39cd43f789aadfafae888199010af134f80de581d62ef
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_with_double_label
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:03020ef43356189c27c77fd1dfec3153f7b8bfd15b449eef171f0d5f93ffd156
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_with_empty_dirs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:6ac23017e088e15e05df6533787c053e766c1ff6705eab5110226127115a8a21
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_with_empty_files
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:8f69b3fadd1b35804d526880f3ed4d9687dea623d5510ba67a0917cdc73e145c
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_with_env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:584c94c1660cd04e74f0aca32f2cb8d8696ee7826cce93b0cd21d6c870825238
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_with_group
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:65c41a3d20558d04a8d6fd4a94b19a70c3ad711f150fed641735128e20df698a
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_with_label
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:89b3df22e6375b6a46bf7cd64729a9c593e9604492eacaf089fc3ef9ae4f5804
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:6fbbd791c5daba03ff50f181cabe5a1cd1088979598f9cdc356ecf7653d39170
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_with_passwd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:802c8849a4a6b51024d5314a177ef2791f641ae601ee161a728734b4b16e30b2
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_with_passwd_tar
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:a87a5060f2abb7dccbd61bf303f66561a170da43076afeeb4dee4444f8e4b5d3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:58a8333ae43fe3e22d91ad8cbf0e171f3b97724e2421bdd16a9b2dcdd343f7e3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:bc6b0d9457585177d993fa23492f044e6ca3801096d34fef6bb2051f98f65b56
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_with_user
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:4e1eef44f9c6deb8e83494a8a815d7f88ed0a411499e8e166942ac3f8930ec8a
1 change: 1 addition & 0 deletions testdata/goldens/ImageTest.test_workdir_with_tar_base
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:242ac990f663c8c49e540d470112b21dbf001b1c984097ab787f4af900543c47
1 change: 1 addition & 0 deletions tests/container/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -955,6 +955,7 @@ TEST_DATA = [
"//testdata%s.tar" % t
for t in TEST_TARGETS
] + [
"//testdata:goldens",
"//testdata:push_compression_gzip_fast",
"//testdata:push_compression_gzip_normal",
"//testdata:stamped_bundle_test",
Expand Down

0 comments on commit e07807d

Please sign in to comment.