Skip to content

ansible: add gcc-8 to Ubuntu 18.04 hosts/containers #2660

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

Merged
merged 2 commits into from
May 28, 2021
Merged

ansible: add gcc-8 to Ubuntu 18.04 hosts/containers #2660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17062af
ansible: add gcc-8 to Ubuntu 18.04 hosts/containers
richardlau May 25, 2021
ca9dcab
ansible: use explicit gcc/g++ on Ubuntu
richardlau May 26, 2021
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
10 changes: 8 additions & 2 deletions ansible/roles/baselayout/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,20 @@ packages: {
],

ubuntu: [
'ccache,g++,gcc,g++-6,gcc-6,git,libfontconfig1,sudo,python3-pip',
'ccache,git,libfontconfig1,sudo,python3-pip',
],

ubuntu1404: [
'ntp,gcc-8,g++-8,gcc-6,g++-6,g++-4.8,gcc-4.8,g++-4.9,gcc-4.9,binutils-2.26',
],

# Default gcc/g++ package is 5.
ubuntu1604: [
'python3.9,python3.9-distutils',
'gcc-8,g++-6,gcc-6,g++-6,python3.9,python3.9-distutils',
],

# Default gcc/g++ package is 7.
ubuntu1804: [
'gcc-6,g++-6,gcc-8,g++-8',
],
}
6 changes: 4 additions & 2 deletions ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ ENV ARCH x64

RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
ccache \
g++ \
gcc \
g++-6 \
gcc-6 \
g++-8 \
gcc-8 \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW I'm not convinced the containers created by ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 are actually being used in our CI.
i.e.

are all empty (compare to an actual non-container e.g. https://ci.nodejs.org/computer/test-packetnet-ubuntu1804-x64-1/builds)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, probably not used, they were at one stage for some temporary testing work and they also exist as a way of experimenting with offloading VM tests to container tests, but other than that they're probably idling (which really only costs us the memory impact of the jenkins nodes)

git \
openjdk-8-jre-headless \
curl \
Expand Down
6 changes: 4 additions & 2 deletions 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 @@ -17,8 +17,10 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install apt-utils -y && \
apt-get dist-upgrade -y && apt-get install -y \
ccache \
g++ \
gcc \
g++-6 \
gcc-6 \
g++-8 \
gcc-8 \
git \
openjdk-8-jre-headless \
curl \
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 @@ -162,6 +162,18 @@ elif [ "$SELECT_ARCH" = "X64" ]; then
echo "Compiler set to GCC 6 for $NODEJS_MAJOR_VERSION"
fi
;;
*ubuntu1804*64 )
if [ "$NODEJS_MAJOR_VERSION" -gt "15" ]; then
export CC="ccache gcc-8"
export CXX="ccache g++-8"
export LINK="g++-8"
else
export CC="ccache gcc-6"
export CXX="ccache g++-6"
export LINK="g++-6"
fi
echo "Compiler set to GCC" `$CXX -dumpversion`
;;
esac

elif [ "$SELECT_ARCH" = "ARM64" ]; then
Expand Down