Skip to content

Commit

Permalink
ansible: update minimum gcc on linux-ppc64le to gcc-6 (#1723)
Browse files Browse the repository at this point in the history
PR-URL: #1723
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
  • Loading branch information
sam-github authored and mhdawson committed Apr 1, 2019
1 parent 87c4a2c commit 03631de
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
4 changes: 2 additions & 2 deletions ansible/roles/baselayout/tasks/partials/repo/ubuntu1404.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---

#
# add PPA for gcc 4.9
# add PPA for gcc updates
#

- name: "repo : add Ubuntu Toolchain PPA"
apt_repository:
repo: 'ppa:ubuntu-toolchain-r/test'
state: present
update_cache: yes
register: has_updated_package_repo
register: has_updated_package_repo
2 changes: 1 addition & 1 deletion ansible/roles/baselayout/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,6 @@ packages: {
],

ubuntu1404: [
'ntp,g++-4.8,gcc-4.8,g++-4.9,gcc-4.9,binutils-2.26',
'ntp,gcc-8,g++-8,gcc-6,g++-6,g++-4.8,gcc-4.8,g++-4.9,gcc-4.9,binutils-2.26',
]
}
1 change: 0 additions & 1 deletion ansible/roles/jenkins-worker/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@
#

dependencies:
- { 'role': 'java-base' }
- { 'role': 'gcc', when: os|startswith("rhel7") }
3 changes: 3 additions & 0 deletions ansible/roles/jenkins-worker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,3 +273,6 @@
when: os in needs_monit
include: monit.yml
static: false

- include_role:
name: java-base
6 changes: 5 additions & 1 deletion jenkins/scripts/select-compiler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ if [ "$SELECT_ARCH" = "PPC64LE" ]; then

echo "Setting compiler for Node version $NODEJS_MAJOR_VERSION on ppc64le"

if [ "$NODEJS_MAJOR_VERSION" -gt "9" ]; then
if [ "$NODEJS_MAJOR_VERSION" -gt "11" ]; then
# See: https://github.com/nodejs/build/pull/1723#discussion_r265740122
export PATH=/usr/lib/binutils-2.26/bin/:$PATH
export COMPILER_LEVEL="6"
elif [ "$NODEJS_MAJOR_VERSION" -gt "9" ]; then
export PATH=/usr/lib/binutils-2.26/bin/:$PATH
export COMPILER_LEVEL="4.9"
fi
Expand Down

0 comments on commit 03631de

Please sign in to comment.