Use a working docker image for build python release packages (#8916)
* Use a working docker image for build python release packages
* Update devtoolset-2-libatomic-devel to devtoolset-9-libatomic-devel
diff --git a/kokoro/release/python/linux/build_artifacts.sh b/kokoro/release/python/linux/build_artifacts.sh
index 5ceb732..4205975 100755
--- a/kokoro/release/python/linux/build_artifacts.sh
+++ b/kokoro/release/python/linux/build_artifacts.sh
@@ -49,15 +49,9 @@
sudo rm -rf $REPO_DIR
}
-build_x86_64_artifact_version() {
- # Stick to a working version
- DOCKER_IMAGE=quay.io/pypa/manylinux2014_x86_64:2021-05-01-28d233a
- build_artifact_version $@
-}
-
build_crosscompiled_aarch64_artifact_version() {
# crosscompilation is only supported with the dockcross manylinux2014 image
- DOCKER_IMAGE=dockcross/manylinux2014-aarch64
+ DOCKER_IMAGE=dockcross/manylinux2014-aarch64:20210706-65bf2dd
PLAT=aarch64
# TODO(jtatermusch): currently when crosscompiling, "auditwheel repair" will be disabled
@@ -65,10 +59,10 @@
build_artifact_version $@
}
-build_x86_64_artifact_version 3.6
-build_x86_64_artifact_version 3.7
-build_x86_64_artifact_version 3.8
-build_x86_64_artifact_version 3.9
+build_artifact_version 3.6
+build_artifact_version 3.7
+build_artifact_version 3.8
+build_artifact_version 3.9
build_crosscompiled_aarch64_artifact_version 3.7
build_crosscompiled_aarch64_artifact_version 3.8
diff --git a/kokoro/release/python/linux/config.sh b/kokoro/release/python/linux/config.sh
index e29eb58..8920495 100644
--- a/kokoro/release/python/linux/config.sh
+++ b/kokoro/release/python/linux/config.sh
@@ -9,8 +9,6 @@
if [ "$PLAT" == "aarch64" ]
then
local configure_host_flag="--host=aarch64"
- else
- yum install -y devtoolset-2-libatomic-devel
fi
# Build protoc and libprotobuf