This is an automated email from the ASF dual-hosted git repository.
bnolsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git
The following commit(s) were added to refs/heads/main by this push:
new f09ee00 add openssl11-* to centos7 container, check for
/opt/openssl11, also update build_h3_tools
new c77cdcb Merge pull request #67 from traeak/centos7_ssl11
f09ee00 is described below
commit f09ee00bcbabbfd6b32e77a45cfed07f913fed8c
Author: Brian Olsen <[email protected]>
AuthorDate: Wed Dec 8 18:27:32 2021 +0000
add openssl11-* to centos7 container, check for /opt/openssl11, also update
build_h3_tools
---
docker/alma/build_h3_tools.sh | 2 +-
docker/centos7/Dockerfile | 8 +++++++-
docker/centos7/build_h3_tools.sh | 2 +-
docker/centos8/build_h3_tools.sh | 2 +-
docker/fedora32/build_h3_tools.sh | 2 +-
jenkins/bin/build.sh | 5 +++++
6 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/docker/alma/build_h3_tools.sh b/docker/alma/build_h3_tools.sh
index eb00d88..1fc9f29 100755
--- a/docker/alma/build_h3_tools.sh
+++ b/docker/alma/build_h3_tools.sh
@@ -77,7 +77,7 @@ set -x
# OpenSSL needs special hackery ... Only grabbing the branch we need here...
Bryan has shit for network.
echo "Building OpenSSL with QUIC support"
-[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH} --depth 1
https://github.com/quictls/openssl.git openssl-quic
+[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH}
https://github.com/quictls/openssl.git openssl-quic
cd openssl-quic
git checkout 5b312bf1bd1361216a817f338eca3830b7c15d85
./config --prefix=${OPENSSL_PREFIX}
diff --git a/docker/centos7/Dockerfile b/docker/centos7/Dockerfile
index 3f4c7b0..6b16c60 100644
--- a/docker/centos7/Dockerfile
+++ b/docker/centos7/Dockerfile
@@ -13,11 +13,17 @@ RUN yum -y install epel-release dnf-plugins-core; yum
config-manager --set-enabl
yum -y install openssl-devel expat-devel pcre-devel libcap-devel
hwloc-devel libunwind-devel \
xz-devel libcurl-devel ncurses-devel jemalloc-devel GeoIP-devel
luajit-devel brotli-devel \
ImageMagick-devel ImageMagick-c++-devel hiredis-devel zlib-devel
libmaxminddb-devel \
- perl-ExtUtils-MakeMaker perl-Digest-SHA perl-URI curl tcl-devel java; \
+ perl-ExtUtils-MakeMaker perl-Digest-SHA perl-URI curl tcl-devel java \
+ openssl11-libs openssl11 openssl11-devel; \
# autest stuff
yum -y install python3 httpd-tools procps-ng nmap-ncat python3-pip \
python3-gunicorn python3-requests python3-devel python3-psutil telnet
golang;
+# Setup openssl11
+RUN mkdir /opt/openssl11 \
+ && ln -s /usr/lib64/openssl11 /opt/openssl11/lib \
+ && ln -s /usr/include/openssl11 /opt/openssl11/include
+
RUN pip3 install pipenv httpbin
RUN if [ ! -z "$(grep -i centos /etc/redhat-release)" ]; then \
yum install -y centos-release-scl; \
diff --git a/docker/centos7/build_h3_tools.sh b/docker/centos7/build_h3_tools.sh
index 31a1183..4fec06d 100644
--- a/docker/centos7/build_h3_tools.sh
+++ b/docker/centos7/build_h3_tools.sh
@@ -79,7 +79,7 @@ set -x
# OpenSSL needs special hackery ... Only grabbing the branch we need here...
Bryan has shit for network.
echo "Building OpenSSL with QUIC support"
-[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH} --depth 1
https://github.com/quictls/openssl.git openssl-quic
+[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH}
https://github.com/quictls/openssl.git openssl-quic
cd openssl-quic
git checkout 5b312bf1bd1361216a817f338eca3830b7c15d85
./config --prefix=${OPENSSL_PREFIX}
diff --git a/docker/centos8/build_h3_tools.sh b/docker/centos8/build_h3_tools.sh
index eb00d88..1fc9f29 100755
--- a/docker/centos8/build_h3_tools.sh
+++ b/docker/centos8/build_h3_tools.sh
@@ -77,7 +77,7 @@ set -x
# OpenSSL needs special hackery ... Only grabbing the branch we need here...
Bryan has shit for network.
echo "Building OpenSSL with QUIC support"
-[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH} --depth 1
https://github.com/quictls/openssl.git openssl-quic
+[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH}
https://github.com/quictls/openssl.git openssl-quic
cd openssl-quic
git checkout 5b312bf1bd1361216a817f338eca3830b7c15d85
./config --prefix=${OPENSSL_PREFIX}
diff --git a/docker/fedora32/build_h3_tools.sh
b/docker/fedora32/build_h3_tools.sh
index eb00d88..1fc9f29 100755
--- a/docker/fedora32/build_h3_tools.sh
+++ b/docker/fedora32/build_h3_tools.sh
@@ -77,7 +77,7 @@ set -x
# OpenSSL needs special hackery ... Only grabbing the branch we need here...
Bryan has shit for network.
echo "Building OpenSSL with QUIC support"
-[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH} --depth 1
https://github.com/quictls/openssl.git openssl-quic
+[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH}
https://github.com/quictls/openssl.git openssl-quic
cd openssl-quic
git checkout 5b312bf1bd1361216a817f338eca3830b7c15d85
./config --prefix=${OPENSSL_PREFIX}
diff --git a/jenkins/bin/build.sh b/jenkins/bin/build.sh
index 9d28c84..0f7cee7 100755
--- a/jenkins/bin/build.sh
+++ b/jenkins/bin/build.sh
@@ -30,6 +30,10 @@ HARDENING=""
# When to turn on ccache, disabled for some builds
CCACHE="--enable-ccache"
+# Check for /opt/openssl11
+OPENSSL=""
+test -d "/opt/openssl11" && OPENSSL="--with-openssl=/opt/openssl11"
+
# When to enable -Werror
#WERROR="--enable-werror"
WERROR=""
@@ -59,6 +63,7 @@ set -x
--enable-experimental-plugins \
--enable-example-plugins \
--with-user=jenkins \
+ ${OPENSSL} \
${CCACHE} \
${WERROR} \
${DEBUG} \
