Merge branch 'master' into testLastGree

.bazelci/presubmit.yml

@@ -85,7 +85,6 @@ platforms:
     - "//tests/container:alpine_custom_attr_digest_test"
     - "//tests/container:alpine_linux_armv6_tar_test_image_tar"
     - "//tests/container:basic_windows_image_test"
-    - "//tests/container:basic_windows_image_test_go_join_layers"
     - "//tests/container:build_tar_test"
     - "//tests/container:distroless_fixed_id_digest_test"
     - "//tests/container:distroless_fixed_id_image_digest_test"
@@ -102,7 +101,6 @@ platforms:
     - "//tests/container:test_digest_output1"
     - "//tests/container:test_digest_output2"
     - "//tests/container:test_push_digest_output"
-    - "//tests/contrib:rename_image_go_test"
     - "//tests/contrib:rename_image_test"
     - "//tests/contrib:test_compare_ids_test"
     - "//tests/contrib:test_compare_ids_test_diff_ids_fails_no_regex"

container/BUILD

@@ -26,51 +26,6 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 
-py_binary(
-    name = "extract_config",
-    srcs = ["extract_config.py"],
-    legacy_create_init = False,
-    python_version = "PY2",
-    visibility = ["//visibility:public"],
-    deps = [
-        "@containerregistry",
-    ],
-)
-
-py_library(
-    name = "utils",
-    srcs = [
-        "__init__.py",
-        "utils.py",
-    ],
-)
-
-py_binary(
-    name = "join_layers",
-    srcs = ["join_layers.py"],
-    legacy_create_init = False,
-    python_version = "PY2",
-    visibility = ["//visibility:public"],
-    deps = [
-        ":utils",
-        "@containerregistry",
-        "@six",
-    ],
-)
-
-py_binary(
-    name = "create_image_config",
-    srcs = ["create_image_config.py"],
-    legacy_create_init = False,
-    python_version = "PY2",
-    visibility = ["//visibility:public"],
-    deps = [
-        ":utils",
-        "@containerregistry",
-        "@six",
-    ],
-)
-
 # TODO(xingao): Flip legacy_create_init to False if possible.
 py_binary(
     name = "build_tar",
@@ -156,7 +111,6 @@ TEST_TARGETS = [
     ":py_image_complex",
     ":war_image",
     ":flat",
-    ":flat_go",
     ":flatten_with_tarball_base",
 ]
 
@@ -166,7 +120,7 @@ TEST_DATA = [
 ] + [
     "//testdata:stamped_bundle_test",
     "//testdata:stamp_info_file.txt",
-    "//tests/container:basic_windows_image_go_join_layers.tar",
+    "//tests/container:basic_windows_image.tar",
 ]
 
 py_test(