[Test] Added a new portability test with OpenSSL 3.0.9 (#33944)

pull/33947/head
Esun Kim 1 year ago committed by GitHub
parent 19c5b18a5a
commit 6574096a64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 32
      templates/tools/dockerfile/test/cxx_debian12_openssl309_x64/Dockerfile.template
  2. 1
      tools/dockerfile/test/cxx_debian12_openssl309_x64.current_version
  3. 125
      tools/dockerfile/test/cxx_debian12_openssl309_x64/Dockerfile
  4. 8
      tools/run_tests/run_tests.py
  5. 1
      tools/run_tests/run_tests_matrix.py

@ -0,0 +1,32 @@
%YAML 1.2
--- |
# Copyright 2023 the gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM debian:12
<%include file="../../apt_get_basic.include"/>
<%include file="../../run_tests_python_deps_pep668.include"/>
<%include file="../../cxx_test_deps.include"/>
<%include file="../../cxx_deps.include"/>
<%include file="../../cmake.include"/>
<%include file="../../ccache.include"/>
<%include file="../../run_tests_addons.include"/>
<%include file="../../git-jenkins.include"/>
# Install openssl 3.0.9
RUN apt-get update && apt-get install -y libssl-dev
# Define the default command.
CMD ["bash"]

@ -0,0 +1 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_debian12_openssl309_x64:0d192c86a2e41e28059a972564b80237137458b7@sha256:e8878bf31f42f8af6a7f3b45d0cb79f29fc46c44721b4a8357a2070ab1f5b3e0

@ -0,0 +1,125 @@
# Copyright 2023 the gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM debian:12
#=================
# Basic C core dependencies
# C/C++ dependencies according to https://github.com/grpc/grpc/blob/master/BUILDING.md
RUN apt-get update && apt-get install -y \
build-essential \
autoconf \
libtool \
pkg-config \
&& apt-get clean
# GCC
RUN apt-get update && apt-get install -y \
gcc \
g++ \
&& apt-get clean
# libc6
RUN apt-get update && apt-get install -y \
libc6 \
libc6-dbg \
libc6-dev \
&& apt-get clean
# Tools
RUN apt-get update && apt-get install -y \
bzip2 \
curl \
dnsutils \
git \
lcov \
make \
strace \
time \
unzip \
wget \
zip \
&& apt-get clean
#====================
# run_tests.py python dependencies
# Basic python dependencies to be able to run tools/run_tests python scripts
# These dependencies are not sufficient to build gRPC Python, gRPC Python
# deps are defined elsewhere (e.g. python_deps.include)
RUN apt-get update && apt-get install -y \
python3 \
python3-pip \
python3-setuptools \
python3-yaml \
&& apt-get clean
# use pinned version of pip to avoid sudden breakages
# Some newer distros that have already implemented PEP 668. Use of
# --break-system-packages is to workaround that. We should look into using
# virtualenv in Dockerfile though.
RUN python3 -m pip install --break-system-packages --upgrade pip==19.3.1
# TODO(jtattermusch): currently six is needed for tools/run_tests scripts
# but since our python2 usage is deprecated, we should get rid of it.
RUN python3 -m pip install six==1.16.0
# Google Cloud Platform API libraries
# These are needed for uploading test results to BigQuery (e.g. by tools/run_tests scripts)
RUN python3 -m pip install --upgrade google-auth==1.23.0 google-api-python-client==1.12.8 oauth2client==4.1.0
# Some cxx tests depend on the twisted package
RUN python3 -m pip install twisted
#=================
# C++ dependencies
RUN apt-get update && apt-get -y install libc++-dev clang && apt-get clean
#=================
# Install cmake
# Note that this step should be only used for distributions that have new enough cmake to satisfy gRPC's cmake version requirement.
RUN apt-get update && apt-get install -y cmake && apt-get clean
#=================
# Install ccache
# Install ccache from source since ccache 3.x packaged with most linux distributions
# does not support Redis backend for caching.
RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \
&& tar -zxf ccache.tar.gz \
&& cd ccache-4.5.1 \
&& mkdir build && cd build \
&& cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \
&& make -j4 && make install \
&& cd ../.. \
&& rm -rf ccache-4.5.1 ccache.tar.gz
RUN mkdir /var/local/jenkins
#=================
# Setup git to access working directory across docker boundary
RUN git config --global --add safe.directory /var/local/jenkins/grpc
RUN git config --global protocol.file.allow always
# Install openssl 3.0.9
RUN apt-get update && apt-get install -y libssl-dev
# Define the default command.
CMD ["bash"]

@ -566,6 +566,13 @@ class CLanguage(object):
)
elif compiler == "gcc12":
return ("gcc_12", ["-DCMAKE_CXX_STANDARD=20"])
elif compiler == "gcc12_openssl309":
return (
"debian12_openssl309",
[
"-DgRPC_SSL_PROVIDER=package",
],
)
elif compiler == "gcc_musl":
return ("alpine", [])
elif compiler == "clang6":
@ -1706,6 +1713,7 @@ argp.add_argument(
"gcc10.2",
"gcc10.2_openssl102",
"gcc12",
"gcc12_openssl309",
"gcc_musl",
"clang6",
"clang15",

@ -357,6 +357,7 @@ def _create_portability_test_jobs(
"gcc7",
# 'gcc10.2_openssl102', // TODO(b/283304471): Enable this later
"gcc12",
# "gcc12_openssl309", // TODO: Enable this later
"gcc_musl",
"clang6",
"clang15",

Loading…
Cancel
Save