From a5b215024c6896745dca43c451acee43692cd4ec Mon Sep 17 00:00:00 2001 From: Eugene Ostroukhov Date: Mon, 25 Sep 2023 13:45:40 -0700 Subject: [PATCH] [test] Update images to Fedora 36 (#34469) --- tools/bazelify_tests/dockerimage_current_versions.bzl | 4 ++-- .../distribtest/python_dev_fedora34_x64.current_version | 1 - .../distribtest/python_dev_fedora36_x64.current_version | 1 + .../Dockerfile | 2 +- .../distribtest/python_fedora34_x64.current_version | 1 - .../distribtest/python_fedora36_x64.current_version | 1 + .../{python_fedora34_x64 => python_fedora36_x64}/Dockerfile | 2 +- tools/run_tests/artifacts/distribtest_targets.py | 4 ++-- 8 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 tools/dockerfile/distribtest/python_dev_fedora34_x64.current_version create mode 100644 tools/dockerfile/distribtest/python_dev_fedora36_x64.current_version rename tools/dockerfile/distribtest/{python_dev_fedora34_x64 => python_dev_fedora36_x64}/Dockerfile (98%) delete mode 100644 tools/dockerfile/distribtest/python_fedora34_x64.current_version create mode 100644 tools/dockerfile/distribtest/python_fedora36_x64.current_version rename tools/dockerfile/distribtest/{python_fedora34_x64 => python_fedora36_x64}/Dockerfile (97%) diff --git a/tools/bazelify_tests/dockerimage_current_versions.bzl b/tools/bazelify_tests/dockerimage_current_versions.bzl index e1032e465ac..854ec65a832 100644 --- a/tools/bazelify_tests/dockerimage_current_versions.bzl +++ b/tools/bazelify_tests/dockerimage_current_versions.bzl @@ -46,11 +46,11 @@ DOCKERIMAGE_CURRENT_VERSIONS = { "tools/dockerfile/distribtest/python_dev_buster_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_buster_x64@sha256:e30d6efdeac24e5136cc169d503a239df22147bfb121d27feb1f87d58a8fe64e", "tools/dockerfile/distribtest/python_dev_buster_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_buster_x86@sha256:179146fd5d5cc15846c6bf0284c2e261f383caf944559d2d9f7a5af0e0f7152d", "tools/dockerfile/distribtest/python_dev_centos7_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_centos7_x64@sha256:e6e9a1b23a0a543050db91e17d621aa899bad04308adaf961c11fa88ba941a95", - "tools/dockerfile/distribtest/python_dev_fedora34_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_fedora34_x64@sha256:20bc3a6283a99407eb637b3cde1ff3e1288a1e21388a1dc385c2b4df5a1eb1c2", + "tools/dockerfile/distribtest/python_dev_fedora36_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_fedora36_x64@sha256:0a4b7da21e779b9aeb76e32c0c98d5f0f2bcaa1b0c2b61a98e152475b7067372", "tools/dockerfile/distribtest/python_dev_ubuntu1604_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_ubuntu1604_x64@sha256:167134c3a43e7d2608c893cc98a5066eae93c6af97ef5a1e69d643cbc7fefc43", "tools/dockerfile/distribtest/python_dev_ubuntu1804_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_ubuntu1804_x64@sha256:157a89cd6d0e69b89ac1975e0314aade556a35aafbaa5fe9f9890f90321d6c89", "tools/dockerfile/distribtest/python_dev_ubuntu2004_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_ubuntu2004_x64@sha256:91f0d88c43ec52ecd63f99acb424c88ff9a67fa046fae207a75e99bee37eef11", - "tools/dockerfile/distribtest/python_fedora34_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_fedora34_x64@sha256:5aa8e41d627ddd6bc10aae6b12d25ded90ba8554a63b279f43f44e0d6cf001dd", + "tools/dockerfile/distribtest/python_fedora36_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_fedora36_x64@sha256:85b2d2fbbcfc1b995ce3916dcf8240c29dbc72f91bd47f04187c2db008570ba4", "tools/dockerfile/distribtest/python_opensuse_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_opensuse_x64@sha256:da52566b078d10e537aa219e59641731a57e5dc7d17d6737f5e5a7d447acf5cc", "tools/dockerfile/distribtest/python_python38_buster_aarch64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_python38_buster_aarch64@sha256:487b9af2ad1459ee2630694e61074d4ac525d4f90b2bdb026dbf6f77fb3e9878", "tools/dockerfile/distribtest/python_ubuntu1604_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_ubuntu1604_x64@sha256:44a821a9f5431122c2e239ba35cf181c2fde84a5d866e8add338599565881492", diff --git a/tools/dockerfile/distribtest/python_dev_fedora34_x64.current_version b/tools/dockerfile/distribtest/python_dev_fedora34_x64.current_version deleted file mode 100644 index 3623301cc57..00000000000 --- a/tools/dockerfile/distribtest/python_dev_fedora34_x64.current_version +++ /dev/null @@ -1 +0,0 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_fedora34_x64:5b754243660c2e5e03ac90bd2efa476cde04bc5c@sha256:20bc3a6283a99407eb637b3cde1ff3e1288a1e21388a1dc385c2b4df5a1eb1c2 \ No newline at end of file diff --git a/tools/dockerfile/distribtest/python_dev_fedora36_x64.current_version b/tools/dockerfile/distribtest/python_dev_fedora36_x64.current_version new file mode 100644 index 00000000000..a5bce419978 --- /dev/null +++ b/tools/dockerfile/distribtest/python_dev_fedora36_x64.current_version @@ -0,0 +1 @@ +us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_fedora36_x64:9d15cd0e55a54e7e7c50c851953fa2c22ee25b1b@sha256:0a4b7da21e779b9aeb76e32c0c98d5f0f2bcaa1b0c2b61a98e152475b7067372 \ No newline at end of file diff --git a/tools/dockerfile/distribtest/python_dev_fedora34_x64/Dockerfile b/tools/dockerfile/distribtest/python_dev_fedora36_x64/Dockerfile similarity index 98% rename from tools/dockerfile/distribtest/python_dev_fedora34_x64/Dockerfile rename to tools/dockerfile/distribtest/python_dev_fedora36_x64/Dockerfile index 0fbfb26c792..cad423d1964 100644 --- a/tools/dockerfile/distribtest/python_dev_fedora34_x64/Dockerfile +++ b/tools/dockerfile/distribtest/python_dev_fedora36_x64/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM fedora:34 +FROM fedora:36 RUN yum clean all && yum update -y && yum install -y python3 python3-pip RUN python3 -m pip install virtualenv==16.7.9 diff --git a/tools/dockerfile/distribtest/python_fedora34_x64.current_version b/tools/dockerfile/distribtest/python_fedora34_x64.current_version deleted file mode 100644 index d473c9771b0..00000000000 --- a/tools/dockerfile/distribtest/python_fedora34_x64.current_version +++ /dev/null @@ -1 +0,0 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/python_fedora34_x64:f46b89fcfbd8d29b98310b614356a29e5488a3b4@sha256:5aa8e41d627ddd6bc10aae6b12d25ded90ba8554a63b279f43f44e0d6cf001dd \ No newline at end of file diff --git a/tools/dockerfile/distribtest/python_fedora36_x64.current_version b/tools/dockerfile/distribtest/python_fedora36_x64.current_version new file mode 100644 index 00000000000..e25dd269e45 --- /dev/null +++ b/tools/dockerfile/distribtest/python_fedora36_x64.current_version @@ -0,0 +1 @@ +us-docker.pkg.dev/grpc-testing/testing-images-public/python_fedora36_x64:e44538c84e7c0e78c953db13a845e264d8a97170@sha256:85b2d2fbbcfc1b995ce3916dcf8240c29dbc72f91bd47f04187c2db008570ba4 \ No newline at end of file diff --git a/tools/dockerfile/distribtest/python_fedora34_x64/Dockerfile b/tools/dockerfile/distribtest/python_fedora36_x64/Dockerfile similarity index 97% rename from tools/dockerfile/distribtest/python_fedora34_x64/Dockerfile rename to tools/dockerfile/distribtest/python_fedora36_x64/Dockerfile index 8c40a5f295d..aad17062a41 100644 --- a/tools/dockerfile/distribtest/python_fedora34_x64/Dockerfile +++ b/tools/dockerfile/distribtest/python_fedora36_x64/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM fedora:34 +FROM fedora:36 RUN yum clean all && yum update -y && yum install -y python3 python3-pip RUN python3 -m pip install virtualenv diff --git a/tools/run_tests/artifacts/distribtest_targets.py b/tools/run_tests/artifacts/distribtest_targets.py index f012719ee73..a2b462bb688 100644 --- a/tools/run_tests/artifacts/distribtest_targets.py +++ b/tools/run_tests/artifacts/distribtest_targets.py @@ -445,7 +445,7 @@ def targets(): # Python PythonDistribTest("linux", "x64", "buster", presubmit=True), PythonDistribTest("linux", "x86", "buster", presubmit=True), - PythonDistribTest("linux", "x64", "fedora34"), + PythonDistribTest("linux", "x64", "fedora36"), PythonDistribTest("linux", "x64", "arch"), PythonDistribTest("linux", "x64", "alpine"), PythonDistribTest("linux", "x64", "ubuntu2004"), @@ -461,7 +461,7 @@ def targets(): PythonDistribTest( "linux", "x86", "buster", source=True, presubmit=True ), - PythonDistribTest("linux", "x64", "fedora34", source=True), + PythonDistribTest("linux", "x64", "fedora36", source=True), PythonDistribTest("linux", "x64", "arch", source=True), PythonDistribTest("linux", "x64", "ubuntu2004", source=True), # Ruby