From 60bdc88302d403fe2d360a94bf54001d3ebe4228 Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Thu, 15 Jun 2023 16:00:22 +1000 Subject: [PATCH 1/2] Pin test_package_pex_environment image to a particular sha --- .../backend/docker/util_rules/docker_build_context_test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/python/pants/backend/docker/util_rules/docker_build_context_test.py b/src/python/pants/backend/docker/util_rules/docker_build_context_test.py index 39f8df22483..681d7fc4c07 100644 --- a/src/python/pants/backend/docker/util_rules/docker_build_context_test.py +++ b/src/python/pants/backend/docker/util_rules/docker_build_context_test.py @@ -393,7 +393,8 @@ def test_packaged_pex_environment(rule_runner: RuleRunner) -> None: """ docker_environment( name="python_38", - image="python:3.8", + image="python:3.8-buster@sha256:bc4b9fb034a871b285bea5418cedfcaa9d2ab5590fb5fb6f0c42aaebb2e2c911", + platform="linux_x86_64", python_bootstrap_search_path=[""], ) From 8945842efe95fa64c068d3e2c9f8c77daa917980 Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Thu, 15 Jun 2023 16:32:08 +1000 Subject: [PATCH 2/2] distributions change --- .../backend/docker/util_rules/docker_build_context_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/pants/backend/docker/util_rules/docker_build_context_test.py b/src/python/pants/backend/docker/util_rules/docker_build_context_test.py index 681d7fc4c07..35b589e9bc5 100644 --- a/src/python/pants/backend/docker/util_rules/docker_build_context_test.py +++ b/src/python/pants/backend/docker/util_rules/docker_build_context_test.py @@ -429,8 +429,8 @@ def test_packaged_pex_environment(rule_runner: RuleRunner) -> None: rule_runner.write_digest(context.digest, path_prefix="contents") with zipfile.ZipFile(os.path.join(rule_runner.build_root, "contents", pex_file), "r") as zf: assert json.loads(zf.read("PEX-INFO"))["distributions"].keys() == { + "psutil-5.9.2-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", "psutil-5.9.2-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", - "psutil-5.9.2-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", }