Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ansible,jenkins: install and use GCC 10 on ubuntu2004_sharedlibs #3485

Merged
merged 4 commits into from
Sep 18, 2023
Merged

ansible,jenkins: install and use GCC 10 on ubuntu2004_sharedlibs #3485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef1e4a0
ansible,jenkins: install and use GCC 10 on ubuntu2004_sharedlibs
targos Sep 13, 2023
09315f9
ansible: install acl package on ubuntu hosts
targos Sep 15, 2023
2caa7c1
ansible: update zlib fetch URL
richardlau Sep 15, 2023
c73b708
ansible: use Python 3.8 in CentOS 7 container
richardlau Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/roles/baselayout/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ packages: {
],

ubuntu: [
'ccache,curl,git,libfontconfig1,sudo,python3-pip',
'acl,ccache,curl,git,libfontconfig1,sudo,python3-pip',
],

# Default gcc/g++ package is 5.
Expand Down
7 changes: 4 additions & 3 deletions ansible/roles/docker/templates/centos7.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV DESTCPU {{ arch }}
ENV ARCH {{ arch }}

RUN yum -y update && \
yum install -y centos-release-scl && \
yum install -y \
gcc \
gcc-c++ \
Expand All @@ -22,12 +23,12 @@ RUN yum -y update && \
java-11-openjdk-headless \
pkgconfig \
curl \
python3-pip \
rh-python38-python-pip \
fontconfig-devel \
libtool \
automake

RUN pip3 install tap2junit=={{ tap2junit_version }}
RUN . /opt/rh/rh-python38/enable && pip3 install tap2junit=={{ tap2junit_version }}

RUN groupadd --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }}

Expand All @@ -39,7 +40,6 @@ RUN yum -y install ccache
RUN yum -y install glibc-devel zip unzip perl openssh-clients libgomp make scl-utils avahi kernel-devel policycoreutils-python which libgfortran
RUN rpm -ivh https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-runtime-6.1-1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-elfutils-libs-0.168-3.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-runtime-3.0-8s.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-ltrace-0.7.91-17.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-strace-4.12-3.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-client-3.0-8s.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gcc-gfortran-6.3.1-3.1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-binutils-2.27-12.el7.1.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-elfutils-libelf-0.168-3.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-elfutils-0.168-3.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gdb-7.12.1-48.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-make-4.1-3.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gcc-c++-6.3.1-3.1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-memstomp-0.1.5-5.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-dwz-0.12-1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-3.0-8s.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-toolchain-6.1-1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gcc-6.3.1-3.1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-valgrind-3.12.0-1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-libstdc++-devel-6.3.1-3.1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-oprofile-1.1.0-4.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-devel-3.0-8s.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-perftools-6.1-1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-6.1-1.el7.aarch64.rpm

RUN yum -y install centos-release-scl
RUN yum -y install devtoolset-8 devtoolset-8-libatomic-devel

VOLUME /home/{{ server_user }}/ /home/{{ server_user }}/.ccache
Expand All @@ -49,6 +49,7 @@ USER iojs:iojs
ENV CCACHE_TEMPDIR /home/iojs/.ccache/{{ item.name }}

CMD cd /home/iojs \
&& . /opt/rh/rh-python38/enable \
&& curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
&& java -Xmx{{ server_ram|default('128m') }} \
-jar /home/{{ server_user }}/agent.jar \
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ ENV ZLIB12DIR /opt/zlib_$ZLIBVER

RUN mkdir -p /tmp/zlib_$ZLIBVER && \
cd /tmp/zlib_$ZLIBVER && \
curl -sL https://zlib.net/zlib-$ZLIBVER.tar.gz | tar zxv --strip=1 && \
curl -sL https://zlib.net/fossils/zlib-$ZLIBVER.tar.gz | tar zxv --strip=1 && \
./configure --prefix=$ZLIB12DIR && \
make -j 6 && \
make install && \
Expand Down
2 changes: 2 additions & 0 deletions ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ RUN apt-get update && apt-get install apt-utils -y && \
ccache \
g++-8 \
gcc-8 \
g++-10 \
gcc-10 \
git \
openjdk-17-jre-headless \
pkg-config \
Expand Down
12 changes: 12 additions & 0 deletions jenkins/scripts/select-compiler.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,18 @@ elif [ "$SELECT_ARCH" = "ARM64" ]; then
fi
echo "Compiler set to GCC" `$CXX -dumpversion`
;;
*ubuntu2004_sharedlibs* )
targos marked this conversation as resolved.
Show resolved Hide resolved
if [ "$NODEJS_MAJOR_VERSION" -gt "19" ]; then
export CC="ccache gcc-10"
export CXX="ccache g++-10"
export LINK="g++-10"
else
export CC="ccache gcc"
export CXX="ccache g++"
export LINK="g++"
fi
echo "Compiler set to GCC" `$CXX -dumpversion`
;;
esac

fi