浏览代码

Revert "testing: temporarily pin docker-py tests to use "bullseye""

This reverts commit 19d860fa9dd25f09cca979830d3a4ccaeb680529.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7786f8512bb0f0ad8689a65758bcfce8bd8a5ce9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 1 年之前
父节点
当前提交
4b404144d2
共有 1 个文件被更改,包括 1 次插入7 次删除
  1. 1 7
      hack/make/test-docker-py

+ 1 - 7
hack/make/test-docker-py

@@ -6,12 +6,6 @@ source hack/make/.integration-test-helpers
 # The commit or tag to use for testing
 # The commit or tag to use for testing
 : "${DOCKER_PY_COMMIT:=7.0.0b1}"
 : "${DOCKER_PY_COMMIT:=7.0.0b1}"
 
 
-# The version (and variant) of the python image to use for the tests;
-# see https://github.com/docker/docker-py/blob/5.0.3/tests/Dockerfile#L1C5-L3
-#
-# TODO remove once https://github.com/docker/docker-py/pull/3145 is merged.
-: "${PYTHON_VERSION:=3.7-bullseye}"
-
 # custom options to pass py.test
 # custom options to pass py.test
 #
 #
 # This option can be used to temporarily skip flaky tests (using the `--deselect`
 # This option can be used to temporarily skip flaky tests (using the `--deselect`
@@ -52,7 +46,7 @@ source hack/make/.integration-test-helpers
 			[ -z "${TESTDEBUG}" ] && build_opts="--quiet"
 			[ -z "${TESTDEBUG}" ] && build_opts="--quiet"
 			[ -f /.dockerenv ] || build_opts="${build_opts} --network=host"
 			[ -f /.dockerenv ] || build_opts="${build_opts} --network=host"
 			# shellcheck disable=SC2086
 			# shellcheck disable=SC2086
-			exec docker build ${build_opts} --build-arg PYTHON_VERSION="${PYTHON_VERSION}" -t "${docker_py_image}" -f tests/Dockerfile "https://github.com/docker/docker-py.git#${DOCKER_PY_COMMIT}"
+			exec docker build ${build_opts} -t "${docker_py_image}" -f tests/Dockerfile "https://github.com/docker/docker-py.git#${DOCKER_PY_COMMIT}"
 		)
 		)
 	fi
 	fi