make it easier to update image_test hashes

zevdg · zevdg · commit edda6871ab72 · 2022-08-23T16:24:52.000-04:00
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.
diff --git a/testdata/BUILD b/testdata/BUILD
@@ -1102,3 +1102,8 @@ bzl_library(
     srcs = ["utils.bzl"],
     visibility = ["//visibility:private"],
 )
+
+filegroup(
+    name = "goldens",
+    srcs = glob(["goldens/**"]),
+)
diff --git a/testdata/goldens/ImageTest.test_base_with_entrypoint b/testdata/goldens/ImageTest.test_base_with_entrypoint
@@ -0,0 +1 @@
+sha256:b8460d575a3d4558057bbdb6f05988259b4f61b1b1f3f117b941043e486914a2
diff --git a/testdata/goldens/ImageTest.test_build_with_tag b/testdata/goldens/ImageTest.test_build_with_tag
@@ -0,0 +1 @@
+sha256:388ccb8b26078eb6dc12e4204e93835fe1886033b1848a964abb71d3c4acb890
diff --git a/testdata/goldens/ImageTest.test_bundle-gae-base b/testdata/goldens/ImageTest.test_bundle-gae-base
@@ -0,0 +1 @@
+sha256:9117535b880556343e328aa20a08a8a2161173371c0e587ce4c7d3a9a4d1d12e
diff --git a/testdata/goldens/ImageTest.test_bundle-pause b/testdata/goldens/ImageTest.test_bundle-pause
@@ -0,0 +1 @@
+sha256:0643112fd89f93bac6f39cd43f789aadfafae888199010af134f80de581d62ef
diff --git a/testdata/goldens/ImageTest.test_bundle-stamped b/testdata/goldens/ImageTest.test_bundle-stamped
@@ -0,0 +1 @@
+sha256:4e1eef44f9c6deb8e83494a8a815d7f88ed0a411499e8e166942ac3f8930ec8a
diff --git a/testdata/goldens/ImageTest.test_bundle-ubuntu b/testdata/goldens/ImageTest.test_bundle-ubuntu
@@ -0,0 +1 @@
+sha256:b8460d575a3d4558057bbdb6f05988259b4f61b1b1f3f117b941043e486914a2
diff --git a/testdata/goldens/ImageTest.test_dashdash_entrypoint b/testdata/goldens/ImageTest.test_dashdash_entrypoint
@@ -0,0 +1 @@
+sha256:921b63580668951c8d1444cd419eecaf64b4a86c86de9a8f657f863201d15962
diff --git a/testdata/goldens/ImageTest.test_data_path-absolute b/testdata/goldens/ImageTest.test_data_path-absolute
@@ -0,0 +1 @@
+replace-me
diff --git a/testdata/goldens/ImageTest.test_data_path-root b/testdata/goldens/ImageTest.test_data_path-root
@@ -0,0 +1 @@
+sha256:c1eca42703357ed58c72bc726450d55ec5d1f1220089a9e447c3ad5b5f1e8356
diff --git a/testdata/goldens/ImageTest.test_data_path-with b/testdata/goldens/ImageTest.test_data_path-with
@@ -0,0 +1 @@
+sha256:c1eca42703357ed58c72bc726450d55ec5d1f1220089a9e447c3ad5b5f1e8356
diff --git a/testdata/goldens/ImageTest.test_data_path-without b/testdata/goldens/ImageTest.test_data_path-without
@@ -0,0 +1 @@
+sha256:d6ea07a7074a7c9cb29c98a064dd900e6f90e7be0628d71c8da509dee419220c
diff --git a/testdata/goldens/ImageTest.test_derivative_with_cmd b/testdata/goldens/ImageTest.test_derivative_with_cmd
@@ -0,0 +1 @@
+sha256:a861490554b3658254af83568adfc83992dc796dbc425fb6f0db35cef2e216ee
diff --git a/testdata/goldens/ImageTest.test_derivative_with_volume b/testdata/goldens/ImageTest.test_derivative_with_volume
@@ -0,0 +1 @@
+sha256:f6c5b0e90cd0f22581669e0b4efd2b530c746bf50b9a8945c584456eafc0ffb6
diff --git a/testdata/goldens/ImageTest.test_directory_with_tar_base b/testdata/goldens/ImageTest.test_directory_with_tar_base
@@ -0,0 +1 @@
+sha256:8fccb0a6c600b88fe117c81e368d62ad558b945cff8927110afed9f4072d2483
diff --git a/testdata/goldens/ImageTest.test_docker_tarball_base b/testdata/goldens/ImageTest.test_docker_tarball_base
@@ -0,0 +1 @@
+sha256:67c9957f23377c8902412429c02c006a8a55fffaa6f44a9963a08aa1986abf01
diff --git a/testdata/goldens/ImageTest.test_dummy_repository b/testdata/goldens/ImageTest.test_dummy_repository
@@ -0,0 +1 @@
+sha256:501c30ee6cb53cedc90d6b050e65bb44fd3fc81d25f0e868f95fedd31f32b097
diff --git a/testdata/goldens/ImageTest.test_files_base b/testdata/goldens/ImageTest.test_files_base
@@ -0,0 +1 @@
+sha256:84a3ebbfae2f49509b76c0beb3414b10fdd1bb0ceeed457754a3e44a251ed019
diff --git a/testdata/goldens/ImageTest.test_files_in_layer_with_file_base b/testdata/goldens/ImageTest.test_files_in_layer_with_file_base
@@ -0,0 +1 @@
+sha256:828eb1d0daa2f797497ec54de421e79a663429e0e791b246c420e84ec171fe7f
diff --git a/testdata/goldens/ImageTest.test_files_with_file_base b/testdata/goldens/ImageTest.test_files_with_file_base
@@ -0,0 +1 @@
+sha256:6793f8771bd38ebed45f5a4516fb67ada632d06b2fc0179e95e01847448c8386
diff --git a/testdata/goldens/ImageTest.test_files_with_tar_base b/testdata/goldens/ImageTest.test_files_with_tar_base
@@ -0,0 +1 @@
+sha256:3ce522f4f9f80249eb75b9b7083a24b17f45c607a40f3d54418c6bad355b399f
diff --git a/testdata/goldens/ImageTest.test_layers_with_docker_tarball_base b/testdata/goldens/ImageTest.test_layers_with_docker_tarball_base
@@ -0,0 +1 @@
+sha256:c0d4751af7d72f7ce80e3997dadfad4f176823743e1b0a5af147d55f70a0c8d5
diff --git a/testdata/goldens/ImageTest.test_layers_with_env b/testdata/goldens/ImageTest.test_layers_with_env
@@ -0,0 +1 @@
+sha256:200f73a0fcbe4f58beb411bd3f649ed1fc847e14353f1ec832ed377c17ffd2fb
diff --git a/testdata/goldens/ImageTest.test_pause_based b/testdata/goldens/ImageTest.test_pause_based
@@ -0,0 +1 @@
+sha256:29ce23be35b02e583cd4b5836024b6cb4e942a8e5e09671de97ae33ed4f06fb9
diff --git a/testdata/goldens/ImageTest.test_pause_piecemeal b/testdata/goldens/ImageTest.test_pause_piecemeal
@@ -0,0 +1 @@
+sha256:ca362da80137d6e22de45cac9705271c694e63d87d4f98f1485288e83bda7334
diff --git a/testdata/goldens/ImageTest.test_pause_piecemeal_gz b/testdata/goldens/ImageTest.test_pause_piecemeal_gz
@@ -0,0 +1 @@
+sha256:ca362da80137d6e22de45cac9705271c694e63d87d4f98f1485288e83bda7334
diff --git a/testdata/goldens/ImageTest.test_tar_base b/testdata/goldens/ImageTest.test_tar_base
@@ -0,0 +1 @@
+sha256:1f952b078e8d380fce4097857f32823976203ed4aaa54821773474f98012bfac
diff --git a/testdata/goldens/ImageTest.test_tar_with_files_base b/testdata/goldens/ImageTest.test_tar_with_files_base
@@ -0,0 +1 @@
+sha256:c1d46001de2e021dcc6943351cc62d1f236c6a3528132ca9014c28dc5bb19d02
diff --git a/testdata/goldens/ImageTest.test_tar_with_mtimes_preserved b/testdata/goldens/ImageTest.test_tar_with_mtimes_preserved
@@ -0,0 +1 @@
+sha256:8167d35b2267136fbb68f92b68fef2893000d74f372d4b694d6b53ca79a20146
diff --git a/testdata/goldens/ImageTest.test_tar_with_tar_base b/testdata/goldens/ImageTest.test_tar_with_tar_base
@@ -0,0 +1 @@
+sha256:3bb6c0ebe52f6f4a76562eee9d79c4c46ff9d9dad749ef55f949d089f7a36b0a
diff --git a/testdata/goldens/ImageTest.test_tars_in_layer_with_tar_base b/testdata/goldens/ImageTest.test_tars_in_layer_with_tar_base
@@ -0,0 +1 @@
+sha256:accf4062e218d20cdcc661dcd5d4ff4f4818d5bc8641db1ed00c884d46ec6999
diff --git a/testdata/goldens/ImageTest.test_with_double_env b/testdata/goldens/ImageTest.test_with_double_env
@@ -0,0 +1 @@
+sha256:0643112fd89f93bac6f39cd43f789aadfafae888199010af134f80de581d62ef
diff --git a/testdata/goldens/ImageTest.test_with_double_label b/testdata/goldens/ImageTest.test_with_double_label
@@ -0,0 +1 @@
+sha256:03020ef43356189c27c77fd1dfec3153f7b8bfd15b449eef171f0d5f93ffd156
diff --git a/testdata/goldens/ImageTest.test_with_empty_dirs b/testdata/goldens/ImageTest.test_with_empty_dirs
@@ -0,0 +1 @@
+sha256:6ac23017e088e15e05df6533787c053e766c1ff6705eab5110226127115a8a21
diff --git a/testdata/goldens/ImageTest.test_with_empty_files b/testdata/goldens/ImageTest.test_with_empty_files
@@ -0,0 +1 @@
+sha256:8f69b3fadd1b35804d526880f3ed4d9687dea623d5510ba67a0917cdc73e145c
diff --git a/testdata/goldens/ImageTest.test_with_env b/testdata/goldens/ImageTest.test_with_env
@@ -0,0 +1 @@
+sha256:584c94c1660cd04e74f0aca32f2cb8d8696ee7826cce93b0cd21d6c870825238
diff --git a/testdata/goldens/ImageTest.test_with_group b/testdata/goldens/ImageTest.test_with_group
@@ -0,0 +1 @@
+sha256:65c41a3d20558d04a8d6fd4a94b19a70c3ad711f150fed641735128e20df698a
diff --git a/testdata/goldens/ImageTest.test_with_label b/testdata/goldens/ImageTest.test_with_label
@@ -0,0 +1 @@
+sha256:89b3df22e6375b6a46bf7cd64729a9c593e9604492eacaf089fc3ef9ae4f5804
diff --git a/testdata/goldens/ImageTest.test_with_millisecond_unix_epoch_creation_time b/testdata/goldens/ImageTest.test_with_millisecond_unix_epoch_creation_time
@@ -0,0 +1 @@
+sha256:6fbbd791c5daba03ff50f181cabe5a1cd1088979598f9cdc356ecf7653d39170
diff --git a/testdata/goldens/ImageTest.test_with_passwd b/testdata/goldens/ImageTest.test_with_passwd
@@ -0,0 +1 @@
+sha256:802c8849a4a6b51024d5314a177ef2791f641ae601ee161a728734b4b16e30b2
diff --git a/testdata/goldens/ImageTest.test_with_passwd_tar b/testdata/goldens/ImageTest.test_with_passwd_tar
@@ -0,0 +1 @@
+sha256:a87a5060f2abb7dccbd61bf303f66561a170da43076afeeb4dee4444f8e4b5d3
diff --git a/testdata/goldens/ImageTest.test_with_rfc_3339_creation_time b/testdata/goldens/ImageTest.test_with_rfc_3339_creation_time
@@ -0,0 +1 @@
+sha256:58a8333ae43fe3e22d91ad8cbf0e171f3b97724e2421bdd16a9b2dcdd343f7e3
diff --git a/testdata/goldens/ImageTest.test_with_unix_epoch_creation_time b/testdata/goldens/ImageTest.test_with_unix_epoch_creation_time
@@ -0,0 +1 @@
+sha256:bc6b0d9457585177d993fa23492f044e6ca3801096d34fef6bb2051f98f65b56
diff --git a/testdata/goldens/ImageTest.test_with_user b/testdata/goldens/ImageTest.test_with_user
@@ -0,0 +1 @@
+sha256:4e1eef44f9c6deb8e83494a8a815d7f88ed0a411499e8e166942ac3f8930ec8a
diff --git a/testdata/goldens/ImageTest.test_workdir_with_tar_base b/testdata/goldens/ImageTest.test_workdir_with_tar_base
@@ -0,0 +1 @@
+sha256:242ac990f663c8c49e540d470112b21dbf001b1c984097ab787f4af900543c47
diff --git a/tests/container/BUILD b/tests/container/BUILD
@@ -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",
diff --git a/tests/container/image_test.py b/tests/container/image_test.py

Original file line number	Diff line number	Diff line change
`@@ -1102,3 +1102,8 @@ bzl_library(`
`1102`	`1102`	`srcs = ["utils.bzl"],`
`1103`	`1103`	`visibility = ["//visibility:private"],`
`1104`	`1104`	`)`
	`1105`	`+`
	`1106`	`+filegroup(`
	`1107`	`+ name = "goldens",`
	`1108`	`+ srcs = glob(["goldens/**"]),`
	`1109`	`+)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+sha256:b8460d575a3d4558057bbdb6f05988259b4f61b1b1f3f117b941043e486914a2`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+sha256:388ccb8b26078eb6dc12e4204e93835fe1886033b1848a964abb71d3c4acb890`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+sha256:9117535b880556343e328aa20a08a8a2161173371c0e587ce4c7d3a9a4d1d12e`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+sha256:0643112fd89f93bac6f39cd43f789aadfafae888199010af134f80de581d62ef`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+sha256:4e1eef44f9c6deb8e83494a8a815d7f88ed0a411499e8e166942ac3f8930ec8a`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+sha256:921b63580668951c8d1444cd419eecaf64b4a86c86de9a8f657f863201d15962`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+sha256:c1eca42703357ed58c72bc726450d55ec5d1f1220089a9e447c3ad5b5f1e8356`