diff --git a/buildenv/docker/mkdocker.sh b/buildenv/docker/mkdocker.sh index 9e5a34d21a9..09892916617 100644 --- a/buildenv/docker/mkdocker.sh +++ b/buildenv/docker/mkdocker.sh @@ -169,6 +169,10 @@ validate_options() { echo "CentOS version 6 is not supported on $arch" >&2 exit 1 fi + if [ $arch = x86_64 ] ; then + # Certificates are old on CentOS:6 so we can't expect wget to check. + wget_O="wget --progress=dot:mega --no-check-certificate -O" + fi ;; 7) ;; @@ -372,6 +376,7 @@ fi echo " perl-devel \\" echo " perl-ExtUtils-MakeMaker \\" # required by git echo " perl-GD \\" + echo " perl-IPC-Cmd \\" # required for openssl v3 compiles echo " perl-libwww-perl \\" echo " perl-Time-HiRes \\" echo " systemtap-devel \\" @@ -459,7 +464,9 @@ if [ $arch = x86_64 ] ; then echo " && $wget_O gettext.tar.gz http://ftp.gnu.org/gnu/gettext/gettext-$gettext_version.tar.gz \\" echo " && tar -xzf gettext.tar.gz \\" echo " && cd gettext-$gettext_version \\" +if [ $version != 6 ] ; then echo " && ./autogen.sh --skip-gnulib \\" +fi echo " && ./configure --disable-nls \\" echo " && make \\" echo " && make install \\" diff --git a/buildenv/jenkins/variables/defaults.yml b/buildenv/jenkins/variables/defaults.yml index f011f9c6a34..cf132a5d31a 100644 --- a/buildenv/jenkins/variables/defaults.yml +++ b/buildenv/jenkins/variables/defaults.yml @@ -297,8 +297,8 @@ x86-64_linux: 8: 'ci.role.build && hw.arch.x86 && sw.tool.docker' 11: 'ci.role.build && hw.arch.x86 && sw.tool.docker' docker_image: - 8: 'eclipseopenj9/jenkins-agent-x86-centos6:16' - 11: 'eclipseopenj9/jenkins-agent-x86-centos6:16' + 8: 'eclipseopenj9/jenkins-agent-x86-centos6:24' + 11: 'eclipseopenj9/jenkins-agent-x86-centos6:24' extra_configure_options: all: '--enable-jitserver' build_env: