ansible: add RHEL 8

Extend Ansible and Jenkins scripts for Red Hat Enterprise Linux 8.
nodejs · Jan 28, 2022 · 7cb46d6 · 7cb46d6
1 parent 606036e
commit 7cb46d6
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 3 deletions.
diff --git a/ansible/inventory.yml b/ansible/inventory.yml
@@ -156,6 +156,7 @@ hosts:
         rhel7-s390x-2: {ip: 148.100.86.117, user: linux1, build_test_v8: yes}
         rhel7-s390x-3: {ip: 148.100.86.28, user: linux1, build_test_v8: yes}
         rhel7-s390x-4: {ip: 148.100.86.94, user: linux1, build_test_v8: yes}
+        rhel8-s390x-1: {ip: 148.100.84.12, user: linux1, build_test_v8: yes}
         ubuntu1804-x64-1: {ip: 52.117.26.14, alias: jenkins-workspace-6}
         ubuntu1804-x64-2: {ip: 50.97.245.9}
 

diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml
@@ -144,6 +144,10 @@ packages: {
     'gcc-c++,sudo,git,zip,unzip,iptables-services,GConf2-devel,openssl-devel,python3',
   ],
 
+  rhel8: [
+    'cmake,gcc-c++,gcc-toolset-11,git,make,python3'
+  ],
+
   smartos: [
     'gccmakedep',
     'git',

diff --git a/ansible/roles/gn/tasks/main.yml b/ansible/roles/gn/tasks/main.yml
@@ -23,7 +23,7 @@
 - name: build gn
   ansible.builtin.shell: |
     python3 build/gen.py && \
-    . /opt/rh/devtoolset-8/enable && \
+    {{ gn_select_compiler }} && \
     {{ gn_dest_dir }}/ninja -C out && \
     out/gn_unittests
   args:

diff --git a/ansible/roles/gn/vars/main.yml b/ansible/roles/gn/vars/main.yml
@@ -0,0 +1,9 @@
+---
+
+compiler: {
+  'centos7': '. /opt/rh/devtoolset-8/enable',
+  'rhel7': '. /opt/rh/devtoolset-8/enable',
+  'rhel8': '. /opt/rh/gcc-toolset-11/enable'
+}
+
+gn_select_compiler: "{{ compiler[os]|default(compiler[os|stripversion])|default('true') }}"
diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml
@@ -15,6 +15,7 @@ packages: {
   'ibmi': 'openjdk-11-ea',
   'macos': 'adoptopenjdk8',
   'rhel7': 'java-1.8.0-openjdk',
+  'rhel8': 'java-17-openjdk',
   'smartos': 'openjdk8',
   'ubuntu': 'openjdk-8-jre-headless',
   'ubuntu1404': 'oracle-java8-installer',

diff --git a/ansible/roles/jenkins-worker/tasks/main.yml b/ansible/roles/jenkins-worker/tasks/main.yml
@@ -329,6 +329,25 @@
   when: os|startswith("zos13")
   command: "chown -R {{ server_user }} {{ home }}/{{ server_user }}/gyp"
 
+# Referenced by CI jobs ("Path of the reference repo to use during clone").
+# This should probably be done on all hosts but the mirrored clone is 1.2G
+# so for now restricted to places we know have enough space.
+- name: create git reference repository
+  file: 
+    path: "{{ home }}/{{ server_user }}/git/io.js.reference"
+    state: directory
+    owner: "{{ server_user }}"
+    group: "{{ server_user }}"
+    mode: 0755
+  register: gitreference
+  when: os == 'rhel8'
+
+- name: populate git reference repository
+  become: yes
+  become_user: "{{ server_user }}"
+  command: "git clone https://github.com/nodejs/node.git --mirror {{ home }}/{{ server_user }}/git/io.js.reference"
+  when: gitreference.changed
+
 # This has to be done before the `service` (and similar) commands because
 # java is needed to start the service
 

diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml
@@ -12,7 +12,7 @@ init: {
   ibmi: 'ibmi73',
   macos: 'macos',
   rhel7: 'rhel7',
-  systemd: ['centos7', 'debian8', 'debian9', 'debian10', 'fedora', 'ubuntu1604', 'ubuntu1804'],
+  systemd: ['centos7', 'debian8', 'debian9', 'debian10', 'fedora', 'rhel8', 'ubuntu1604', 'ubuntu1804'],
   svc: 'smartos',
   upstart: ['ubuntu12', 'ubuntu1404'],
   zos_start: 'zos'

diff --git a/ansible/roles/package-upgrade/vars/main.yml b/ansible/roles/package-upgrade/vars/main.yml
@@ -7,7 +7,7 @@
   pm: {
     'yum': ['centos', 'rhel7', 'aix', 'ibmi'],
     'apt': ['debian', 'ubuntu'],
-    'dnf': 'fedora',
+    'dnf': ['fedora', 'rhel8'],
     'pkg': 'freebsd',
     'pkgin': 'smartos',
     'chocolatey': 'win',

diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy
@@ -30,6 +30,7 @@ def buildExclusions = [
   [ /debian8-x86/,                    anyType,     gte(10) ], // 32-bit linux for <10 only
   [ /debian8/,                        anyType,     gte(13) ],
   [ /debian9/,                        anyType,     gte(16) ],
+  [ /rhel8/,                          anyType,     lt(14)  ],
   [ /^ubuntu1804/,                    anyType,     lt(10)  ], // probably temporary
   [ /^ubuntu1404-32/,                 anyType,     gte(10) ], // 32-bit linux for <10 only
   [ /^ubuntu1404-64/,                 anyType,     gte(12) ],

diff --git a/jenkins/scripts/select-compiler.sh b/jenkins/scripts/select-compiler.sh
@@ -32,6 +32,17 @@ if [ -z ${NODEJS_MAJOR_VERSION+x} ]; then
   NODEJS_MAJOR_VERSION="$(echo "$NODE_VERSION" | cut -d . -f 1)"
 fi
 
+# Linux distros should be arch agnostic
+case $NODE_NAME in
+  *rhel8*)
+    # TODO: add LTO
+    echo "Setting compiler for Node.js $NODEJS_MAJOR_VERSION on " `cat /etc/redhat-release`
+    # Default gcc on RHEL 8 is gcc 8
+    echo "Compiler left as system default:" `g++ -dumpversion`
+    return
+    ;;
+esac
+
 if [ "$SELECT_ARCH" = "PPC64LE" ]; then
   # Set default
   export COMPILER_LEVEL="4.8"