Skip to content

Commit

Permalink
Vendor a GPG public key
Browse files Browse the repository at this point in the history
The remote server we fetched it from was providing two different files (differing by a whitespace)
which caused the content hash to be unstable, making CI fail most of the time.

Note this hash was changed in the last month by
08cddcc
so the instability has been here for a while.
  • Loading branch information
alexeagle committed Apr 24, 2021
1 parent d534522 commit 0086a29
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 8 deletions.
6 changes: 0 additions & 6 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,6 @@ http_file(
urls = ["https://bazel.build/bazel-release.pub.gpg"],
)

http_file(
name = "launchpad_openjdk_gpg",
sha256 = "e9a596d0c194a562be9fd2c2a0994d7885505a1145fed0fbd5ae4c11d56220a0",
urls = ["http://keyserver.ubuntu.com/pks/lookup?op=get&fingerprint=on&search=0xEB9B1D8886F44E2A"],
)

container_load(
name = "pause_tar",
file = "//testdata:pause.tar",
Expand Down
10 changes: 10 additions & 0 deletions tests/docker/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,13 @@
package(default_visibility = ["//visibility:public"])

licenses(["notice"]) # Apache 2.0

# This file fetched from
# wget "http://keyserver.ubuntu.com/pks/lookup?op=get&fingerprint=on&search=0xEB9B1D8886F44E2A"
# because it was being served with unstable contents, causing our CI
# to fail 50% of the time.
filegroup(
name = "launchpad_openjdk_gpg",
srcs = ["launchpad_openjdk_gpg.pub"],
visibility = ["//tests/docker:__subpackages__"],
)
14 changes: 14 additions & 0 deletions tests/docker/launchpad_openjdk_gpg.pub
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Comment: Hostname:
Version: Hockeypuck ~unreleased

xo0ES8OmlQEEALy8ttT3KgmjoqCkeU7S04/j615RDivV0CHv+5mdJFQY10wo6v6k
rmXxK757eIoRDN1B3ztl8vjqLHxi8oA+f4inZcrrIZYjW0MghO+IcKEbKCrPUPjD
fQBSIvZD5ZaiibMNwZJ6TidS2r6nSAH+aoMRgXYycQPGkAHDcaPKY54zABEBAAHN
JExhdW5jaHBhZCBPcGVuSkRLIGJ1aWxkcyAoYWxsIGFyY2hzKcK2BBMBAgAgBQJL
w6aVAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ65sdiIb0TiraSgQAr+WD
+qGcW5yrkS2QBMq+g+Ew2tLqeDLw8Y2xZ4BhnRzB3WljBfwj7wt/KOugjJWaEWuY
GiuLBf6vy+At5VtXs0FSk6oIZR0XZvUVamFPXeTkZqUiw4oTNlBTeOhAxrevRWzn
mLuRAIWlr0dARJyLCK5MMVVhesouoG8WpOrniXs=
=JbYw
-----END PGP PUBLIC KEY BLOCK-----
2 changes: 1 addition & 1 deletion tests/docker/package_managers/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ add_apt_key(
image = "@debian9//:builder.tar",
keys = [
"@bazel_gpg//file",
"@launchpad_openjdk_gpg//file",
"//tests/docker:launchpad_openjdk_gpg",
],
)

Expand Down
2 changes: 1 addition & 1 deletion tests/docker/toolchain_container/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ container_test(
pkg_tar(
name = "test_tar",
files = [
"@launchpad_openjdk_gpg//file",
"//tests/docker:launchpad_openjdk_gpg",
],
)

Expand Down

0 comments on commit 0086a29

Please sign in to comment.