Skip to content

Commit 6ef024c

Browse files
committed
MB-69924: Ensure perl-core is present on single linux image
OpenSSL 3.5.4 builds error out if perl-core is not present. This change also switches back to ftp.gnu.org from the mirror url, as it is currently serving 502s. Change-Id: I52e19f054c9ec4961d52722bb7b4cf4f75e5ab63 Reviewed-on: https://review.couchbase.org/c/build-infra/+/238005 Tested-by: Blair Watt <[email protected]> Reviewed-by: Ming Ho <[email protected]>
1 parent 479905e commit 6ef024c

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

docker-stacks/couchbase-server/server-jenkins-agents.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ services:
151151
<<: *default-jenkins-one-agent
152152

153153
linux-single:
154-
image: couchbasebuild/server-linux-build:20251104
154+
image: couchbasebuild/server-linux-build:20251222
155155
environment:
156156
- "JENKINS_SLAVE_NAME=server-linux"
157157
- "JENKINS_SLAVE_LABELS=server python3 linux linux-asan all monster neo elixir morpheus trinity cypher x86_64"

docker/buildslaves/couchbase-server/single/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ FROM base-compile AS sed-compile
5151
WORKDIR /tmp
5252
ARG SED_VERSION=4.9
5353
ARG SED_SHA=6aac9b2dbafcd5b7a67a8a9bcb8036c3
54-
ADD https://ftpmirror.gnu.org/gnu/sed/sed-${SED_VERSION}.tar.xz /tmp/sed.tar.xz
54+
ADD https://ftp.gnu.org/gnu/sed/sed-${SED_VERSION}.tar.xz /tmp/sed.tar.xz
5555
RUN set -x \
5656
&& echo ${SED_SHA} /tmp/sed.tar.xz | md5sum -c - \
5757
&& mkdir /tmp/sed && cd /tmp/sed \
@@ -86,9 +86,9 @@ ARG AUTOMAKE_VER
8686
ARG LIBTOOL_VER
8787
RUN ulimit -n 1024 && yum install -y --setopt=skip_missing_names_on_install=False --setopt=keepcache=0 perl-Data-Dumper m4
8888
RUN cd /tmp && mkdir autoconf automake libtool
89-
RUN curl -Lf http://ftpmirror.gnu.org/autoconf/autoconf-${AUTOCONF_VER}.tar.gz | tar xz --strip-components=1 -C /tmp/autoconf
90-
RUN curl -Lf http://ftpmirror.gnu.org/automake/automake-${AUTOMAKE_VER}.tar.gz | tar xz --strip-components=1 -C /tmp/automake
91-
RUN curl -Lf http://ftpmirror.gnu.org/libtool/libtool-${LIBTOOL_VER}.tar.gz | tar xz --strip-components=1 -C /tmp/libtool
89+
RUN curl -Lf http://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VER}.tar.gz | tar xz --strip-components=1 -C /tmp/autoconf
90+
RUN curl -Lf http://ftp.gnu.org/gnu/automake/automake-${AUTOMAKE_VER}.tar.gz | tar xz --strip-components=1 -C /tmp/automake
91+
RUN curl -Lf http://ftp.gnu.org/gnu/libtool/libtool-${LIBTOOL_VER}.tar.gz | tar xz --strip-components=1 -C /tmp/libtool
9292
RUN cd /tmp/autoconf && ./configure --prefix=/usr/local && make -j && make install
9393
RUN cd /tmp/automake && ./configure --prefix=/usr/local && make -j && make install
9494
RUN cd /tmp/libtool && ./configure --prefix=/usr/local && make -j && make install
@@ -304,7 +304,7 @@ RUN set -x \
304304
&& yum install -y texinfo gmp-devel mpfr-devel && yum clean all \
305305
&& mkdir -p /opt/gdb-${GDB_VER} /tmp/gdb \
306306
&& cd /tmp/gdb \
307-
&& curl -Lf https://ftpmirror.gnu.org/gnu/gdb/gdb-${GDB_VER}.tar.gz -o - \
307+
&& curl -Lf https://ftp.gnu.org/gnu/gdb/gdb-${GDB_VER}.tar.gz -o - \
308308
| tar xz --strip-components=1 \
309309
&& ./configure --prefix=/opt/gdb-${GDB_VER} \
310310
&& make -j$(nproc) \
@@ -315,6 +315,7 @@ RUN set -x \
315315
# Perl modules
316316
RUN ulimit -n 1024 && \
317317
yum install -y --setopt=skip_missing_names_on_install=False --setopt=keepcache=0 \
318+
perl-core \
318319
perl-Data-Dumper \
319320
perl-Digest-SHA \
320321
perl-Digest-MD5 \

0 commit comments

Comments
 (0)